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

Commit ed33ce8d authored by Yi Kong's avatar Yi Kong Committed by android-build-merger
Browse files

Merge changes I52805f5d,Ifb16ed87 am: f41d24ac 

am: 594b3e16

Change-Id: I1fdc15bd3c4f130125f45374197f4e1a611a4968
parents c5c5be78 594b3e16

core/aux_toolchain.mk

+0 −1
Original line number Diff line number Diff line
@@ -50,4 +50,3 @@ LOCAL_NO_DEFAULT_COMPILER_FLAGS := true 
LOCAL_SYSTEM_SHARED_LIBRARIES :=

LOCAL_CXX_STL := none

LOCAL_NO_PIC := true
 
LOCAL_NO_LIBCOMPILER_RT := true

core/binary.mk

+0 −7
Original line number Diff line number Diff line
@@ -396,13 +396,6 @@ endif 


include $(BUILD_SYSTEM)/config_sanitizers.mk



ifneq ($(LOCAL_NO_LIBCOMPILER_RT),true)

# Add in libcompiler_rt for all regular device builds

ifeq (,$(WITHOUT_LIBCOMPILER_RT))

  my_static_libraries += $(COMPILER_RT_CONFIG_EXTRA_STATIC_LIBRARIES)

endif

endif



# Statically link libwinpthread when cross compiling win32.

ifeq ($($(my_prefix)OS),windows)

  my_static_libraries += libwinpthread

core/clang/HOST_CROSS_x86.mk

+1 −0
Original line number Diff line number Diff line 
$(clang_2nd_arch_prefix)HOST_CROSS_LIBPROFILE_RT := $(LLVM_RTLIB_PATH)/libclang_rt.profile-i386.a

$(clang_2nd_arch_prefix)HOST_CROSS_LIBCRT_BUILTINS := $(LLVM_RTLIB_PATH)/libclang_rt.bulitins-i386.a

core/clang/HOST_CROSS_x86_64.mk

+1 −0
Original line number Diff line number Diff line 
$(clang_2nd_arch_prefix)HOST_CROSS_LIBPROFILE_RT := $(LLVM_RTLIB_PATH)/libclang_rt.profile-x86_64.a

$(clang_2nd_arch_prefix)HOST_CROSS_LIBCRT_BUILTINS := $(LLVM_RTLIB_PATH)/libclang_rt.builtins-x86_64.a

core/clang/HOST_x86.mk

+1 −0
Original line number Diff line number Diff line 
$(clang_2nd_arch_prefix)HOST_LIBPROFILE_RT := $(LLVM_RTLIB_PATH)/libclang_rt.profile-i386.a

$(clang_2nd_arch_prefix)HOST_LIBCRT_BUILTINS := $(LLVM_RTLIB_PATH)/libclang_rt.builtins-i386.a