Remove libcompiler_rt.so dependency for RS compat lib.

Change-Id: I0d871c9c7d7946b8551fdefd201603bb59ea010e

diff --git a/core/definitions.mk b/core/definitions.mk
index be26024..cb20d8f 100644 (file)
--- 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 -lcompiler_rt
+       -lRSSupport -lm
 endef
 
 ###########################################################

diff --git a/core/java.mk b/core/java.mk
index b16038e..02cfad7 100644 (file)
--- a/core/java.mk
+++ b/core/java.mk
@@ -218,13 +218,11 @@ 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 libcompiler_rt
 
 $(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)