Build RS compatibility library apps with libcompiler_rt.so too.
Change-Id: Ibc14ceb473bef23ab9e28f3a6bf7e4e99d529c01
diff --git a/core/definitions.mk b/core/definitions.mk
index cb20d8f..be26024 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -828,7 +828,7 @@
$(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 8ed686f..9e453a9 100644
--- a/core/java.mk
+++ b/core/java.mk
@@ -210,7 +210,7 @@
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 @@
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)
