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

Commit f3f8ea86 authored by Shih-wei Liao's avatar Shih-wei Liao Committed by Android (Google) Code Review
Browse files

Merge "Fix libcompiler-rt. Use the official name libcompiler_rt."

parents 9d38ec78 c8dfc169

core/binary.mk

+1 −1
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ ifeq ($(strip $(LOCAL_ADDRESS_SANITIZER)),true) 
  LOCAL_STATIC_LIBRARIES += $(ADDRESS_SANITIZER_CONFIG_EXTRA_STATIC_LIBRARIES)

endif



# Add in libcompiler-rt for all regular device builds

# Add in libcompiler_rt for all regular device builds

ifeq (,$(LOCAL_SDK_VERSION)$(LOCAL_IS_HOST_MODULE)$(WITHOUT_LIBCOMPILER_RT))

  LOCAL_STATIC_LIBRARIES += $(COMPILER_RT_CONFIG_EXTRA_STATIC_LIBRARIES)

endif

core/java.mk

+2 −2
Original line number Diff line number Diff line
@@ -210,11 +210,11 @@ $(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

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

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

core/llvm_config.mk

+1 −1
Original line number Diff line number Diff line
@@ -106,4 +106,4 @@ ADDRESS_SANITIZER_CONFIG_EXTRA_STATIC_LIBRARIES := libasan 


# This allows us to use the superset of functionality that compiler-rt

# provides to Clang (for supporting features like -ftrapv).

COMPILER_RT_CONFIG_EXTRA_STATIC_LIBRARIES := libcompiler-rt-extras
 
COMPILER_RT_CONFIG_EXTRA_STATIC_LIBRARIES := libcompiler_rt-extras