From 90a94b4bb22ce2e4f413bdd9e21a9575255a877c Mon Sep 17 00:00:00 2001 From: Stephen Hines Date: Fri, 1 Feb 2013 19:37:33 -0800 Subject: [PATCH] Build RS compatibility library apps with libcompiler_rt.so too. Change-Id: Ibc14ceb473bef23ab9e28f3a6bf7e4e99d529c01 --- core/definitions.mk | 2 +- core/java.mk | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/core/definitions.mk b/core/definitions.mk index cb20d8f4d1..be26024884 100644 --- a/core/definitions.mk +++ b/core/definitions.mk @@ -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 ########################################################### diff --git a/core/java.mk b/core/java.mk index 8ed686f4cb..9e453a9333 100644 --- a/core/java.mk +++ b/core/java.mk @@ -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)