Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9c5e2993 authored by Tim Murray's avatar Tim Murray Committed by Android (Google) Code Review
Browse files

Merge "Attempt #2: libclcore.bc comes from prebuilts/sdk for unbundled projects."

parents aa8c2956 99b060f6

core/definitions.mk

+2 −1
Original line number Diff line number Diff line
@@ -827,7 +827,8 @@ $(hide) $(PRIVATE_CXX) -shared -Wl,-soname,$(notdir $@) -nostdlib \ 
	$(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



###########################################################

core/java.mk

+9 −1
Original line number Diff line number Diff line
@@ -206,10 +206,17 @@ 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)
@@ -218,6 +225,7 @@ $(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)