Revert "libclcore.bc comes from prebuilts/sdk for unbundled projects."

This reverts commit ba6a7e1d46

Change-Id: I2855923e67c226d39fe362342570e9ab96b885b8
This commit is contained in:
Stephen Hines 2013-01-23 18:39:05 +00:00 committed by Android (Google) Code Review
parent ba6a7e1d46
commit 8f199b0588
2 changed files with 2 additions and 11 deletions

View File

@ -829,8 +829,7 @@ $(hide) $(PRIVATE_CXX) -shared -Wl,-soname,$(notdir $@) -nostdlib \
$(dir $@)/$(notdir $(<:.bc=.o)) \
$(PRIVATE_COMPILER_RT) \
-o $@ -L prebuilts/gcc/ \
-L $(TARGET_OUT_INTERMEDIATE_LIBRARIES) $(PRIVATE_LIBPATH) \
-lRSSupport -lm
-L $(TARGET_OUT_INTERMEDIATE_LIBRARIES) -lRSSupport -lm
endef
###########################################################

View File

@ -206,17 +206,10 @@ rs_compatibility_jni_libs := $(addprefix \
$(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)
@ -225,7 +218,6 @@ $(rs_compatibility_jni_libs): $(rs_support_lib) $(rs_jni_lib) $(rs_compiler_rt)
$(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)