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

Commit 022a9336 authored by Stephen Hines's avatar Stephen Hines Committed by Android (Google) Code Review
Browse files

Merge "Build RS compatibility objects with libcompiler-rt.a."

parents d50364fd 9541f586

core/definitions.mk

+3 −1
Original line number Diff line number Diff line
@@ -826,7 +826,9 @@ $(hide) $(BCC_COMPAT) -O3 -o $(dir $@)/$(notdir $(<:.bc=.o)) -fPIC -shared \ 
	-rt-path $(PRIVATE_LIBCLCORE) $<

$(hide) $(PRIVATE_CXX) -shared -Wl,-soname,$(notdir $@) -nostdlib \

	-Wl,-rpath,\$$ORIGIN/../lib \

	$(dir $@)/$(notdir $(<:.bc=.o)) -o $@ -L prebuilts/gcc/ \

	$(dir $@)/$(notdir $(<:.bc=.o)) \

	$(PRIVATE_COMPILER_RT) \

	-o $@ -L prebuilts/gcc/ \

	-L $(TARGET_OUT_INTERMEDIATE_LIBRARIES) -lRSSupport -lm

endef

core/java.mk

+3 −1
Original line number Diff line number Diff line
@@ -209,13 +209,15 @@ $(rs_generated_bc) : $(RenderScript_file_stamp) 
rs_built_clcore := $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libclcore.bc_intermediates/libclcore.bc

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)

$(rs_compatibility_jni_libs): $(BCC_COMPAT) $(rs_built_clcore)

$(rs_compatibility_jni_libs): $(rs_support_lib) $(rs_jni_lib)

$(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): $(renderscript_intermediate)/lib%.so: \

    $(renderscript_intermediate)/res/raw/%.bc

	$(transform-bc-to-so)