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

Commit 48725b83 authored by Shih-wei Liao's avatar Shih-wei Liao Committed by Android (Google) Code Review
Browse files

Merge "Build RS compatibility library apps with libcompiler_rt.so too."

parents f3f8ea86 90a94b4b

core/definitions.mk

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

	-o $@ -L prebuilts/gcc/ \

	-L $(TARGET_OUT_INTERMEDIATE_LIBRARIES) $(PRIVATE_LIBPATH) \

	-lRSSupport -lm

	-lRSSupport -lm -lcompiler_rt

endef



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

core/java.mk

+3 −1
Original line number Diff line number Diff line
@@ -210,7 +210,7 @@ $(rs_generated_bc) : $(RenderScript_file_stamp) 
ifeq (,$(TARGET_BUILD_APPS))

rs_built_clcore := $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libclcore.bc_intermediates/libclcore.bc

rs_extra_libpath :=

rs_compiler_rt := $(call intermediates-dir-for,STATIC_LIBRARIES,libcompiler-rt)/libcompiler_rt.a

rs_compiler_rt := $(call intermediates-dir-for,STATIC_LIBRARIES,libcompiler_rt)/libcompiler_rt.a

else

rs_built_clcore := prebuilts/sdk/renderscript/lib/libclcore.bc

rs_extra_libpath := -L prebuilts/ndk/8/platforms/android-9/arch-arm/usr/lib
@@ -218,11 +218,13 @@ rs_compiler_rt := prebuilts/sdk/renderscript/lib/libcompiler_rt.a 
endif # TARGET_BUILD_APPS

rs_support_lib := $(TARGET_OUT_INTERMEDIATE_LIBRARIES)/libRSSupport.so

rs_jni_lib := $(TARGET_OUT_INTERMEDIATE_LIBRARIES)/librsjni.so

rs_compiler_rt_so := $(TARGET_OUT_INTERMEDIATE_LIBRARIES)/libcompiler_rt.so

LOCAL_JNI_SHARED_LIBRARIES += libRSSupport librsjni



$(rs_compatibility_jni_libs): $(RenderScript_file_stamp)

$(rs_compatibility_jni_libs): $(BCC_COMPAT) $(rs_built_clcore)

$(rs_compatibility_jni_libs): $(rs_support_lib) $(rs_jni_lib) $(rs_compiler_rt)

$(rs_compatibility_jni_libs): $(rs_compiler_rt_so)

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

$(rs_compatibility_jni_libs): PRIVATE_LIBCLCORE := $(rs_built_clcore)

$(rs_compatibility_jni_libs): PRIVATE_COMPILER_RT := $(rs_compiler_rt)