Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8db4ccea authored by Stephen Hines's avatar Stephen Hines
Browse files

Link RS compatibility files with libc and make bcc_compat a regular dep. 

If we don't do "-lc", we end up missing symbols like "memset" on our non-NEON
builds. It also makes more sense to have bcc_compat as a standard dependency
for now, since it occasionally changes the way we compile/link our source
files.

Change-Id: I4b0ead66caa7c72fb7733db8804a33faa5350930
parent d3e01c15

core/definitions.mk

+1 −1
Original line number Diff line number Diff line
@@ -833,7 +833,7 @@ $(hide) $(PRIVATE_CXX) -shared -Wl,-soname,$(notdir $@) -nostdlib \ 
	$(RS_PREBUILT_COMPILER_RT) \

	-o $@ -L prebuilts/gcc/ \

	-L $(TARGET_OUT_INTERMEDIATE_LIBRARIES) $(RS_PREBUILT_LIBPATH) \

	-lRSSupport -lm

	-lRSSupport -lm -lc

endef



###########################################################

core/java.mk

+1 −1
Original line number Diff line number Diff line
@@ -214,7 +214,7 @@ LOCAL_JNI_SHARED_LIBRARIES += libRSSupport librsjni 


$(rs_compatibility_jni_libs): $(RenderScript_file_stamp) $(RS_PREBUILT_CLCORE) \

    $(rs_support_lib) $(rs_jni_lib) $(rs_compiler_rt)

$(rs_compatibility_jni_libs): | $(BCC_COMPAT)

$(rs_compatibility_jni_libs): $(BCC_COMPAT)

$(rs_compatibility_jni_libs): PRIVATE_CXX := $(TARGET_CXX)

$(rs_compatibility_jni_libs): $(renderscript_intermediate)/librs.%.so: \

    $(renderscript_intermediate.COMMON)/res/raw/%.bc