Attempt #2: libclcore.bc comes from prebuilts/sdk for unbundled projects.
This change also adds the NDK library path for unbundled builds.
Bug: 7419958
Change-Id: Id8b608b5dd49d72bec697da8fa7a9393d2ab735f
diff --git a/core/definitions.mk b/core/definitions.mk
index c91220d..cb20d8f 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -827,7 +827,8 @@
$(dir $@)/$(notdir $(<:.bc=.o)) \
$(PRIVATE_COMPILER_RT) \
-o $@ -L prebuilts/gcc/ \
- -L $(TARGET_OUT_INTERMEDIATE_LIBRARIES) -lRSSupport -lm
+ -L $(TARGET_OUT_INTERMEDIATE_LIBRARIES) $(PRIVATE_LIBPATH) \
+ -lRSSupport -lm
endef
###########################################################
diff --git a/core/java.mk b/core/java.mk
index d498ab7..427a30c 100644
--- a/core/java.mk
+++ b/core/java.mk
@@ -206,10 +206,17 @@
$(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
+else
+rs_built_clcore := prebuilts/sdk/renderscript/lib/libclcore.bc
+rs_extra_libpath := -L prebuilts/ndk/8/platforms/android-9/arch-arm/usr/lib
+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 := $(call intermediates-dir-for,STATIC_LIBRARIES,libcompiler-rt)/libcompiler-rt.a
LOCAL_JNI_SHARED_LIBRARIES += libRSSupport librsjni
$(rs_compatibility_jni_libs): $(RenderScript_file_stamp)
@@ -218,6 +225,7 @@
$(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)
+$(rs_compatibility_jni_libs): PRIVATE_LIBPATH := $(rs_extra_libpath)
$(rs_compatibility_jni_libs): $(renderscript_intermediate)/lib%.so: \
$(renderscript_intermediate)/res/raw/%.bc
$(transform-bc-to-so)
