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

Commit 7a415131 authored by Ying Wang's avatar Ying Wang Committed by Android Git Automerger
Browse files

Merge branch 'lmp-dev-plus-aosp' of... 

Merge branch 'lmp-dev-plus-aosp' of https://googleplex-android.googlesource.com/_direct/platform/build into lmp-dev-plus-aosp
parents 6375bcaf 37d05885

core/binary.mk

+6 −6
Original line number Diff line number Diff line
@@ -133,12 +133,12 @@ my_asflags += $(LOCAL_ASFLAGS_$($(my_prefix)$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)) $ 
my_c_includes += $(LOCAL_C_INCLUDES_$($(my_prefix)$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)) $(LOCAL_C_INCLUDES_$(my_32_64_bit_suffix))

my_generated_sources += $(LOCAL_GENERATED_SOURCES_$($(my_prefix)$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)) $(LOCAL_GENERATED_SOURCES_$(my_32_64_bit_suffix))



my_clang := $(LOCAL_CLANG)

my_clang := $(strip $(LOCAL_CLANG))

ifdef LOCAL_CLANG_$(my_32_64_bit_suffix)

my_clang := $(LOCAL_CLANG_$(my_32_64_bit_suffix))

my_clang := $(strip $(LOCAL_CLANG_$(my_32_64_bit_suffix)))

endif

ifdef LOCAL_CLANG_$($(my_prefix)$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)

my_clang := $(LOCAL_CLANG_$($(my_prefix)$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH))

my_clang := $(strip $(LOCAL_CLANG_$($(my_prefix)$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)))

endif



# clang is enabled by default for host builds
@@ -314,7 +314,7 @@ else 
endif



ifeq ($(strip $(my_cc)),)

  ifeq ($(strip $(my_clang)),true)

  ifeq ($(my_clang),true)

    my_cc := $(CLANG)

  else

    my_cc := $($(LOCAL_2ND_ARCH_VAR_PREFIX)$(my_prefix)CC)
@@ -330,7 +330,7 @@ endif 
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_CC := $(my_cc)



ifeq ($(strip $(my_cxx)),)

  ifeq ($(strip $(my_clang)),true)

  ifeq ($(my_clang),true)

    my_cxx := $(CLANG_CXX)

  else

    my_cxx := $($(LOCAL_2ND_ARCH_VAR_PREFIX)$(my_prefix)CXX)
@@ -380,7 +380,7 @@ normal_objects_mode := $(if $(LOCAL_ARM_MODE),$(LOCAL_ARM_MODE),thumb) 
# actually used (although they are usually empty).

arm_objects_cflags := $($(LOCAL_2ND_ARCH_VAR_PREFIX)$(my_prefix)$(arm_objects_mode)_CFLAGS)

normal_objects_cflags := $($(LOCAL_2ND_ARCH_VAR_PREFIX)$(my_prefix)$(normal_objects_mode)_CFLAGS)

ifeq ($(strip $(my_clang)),true)

ifeq ($(my_clang),true)

arm_objects_cflags := $(call $(LOCAL_2ND_ARCH_VAR_PREFIX)convert-to-$(my_host)clang-flags,$(arm_objects_cflags))

normal_objects_cflags := $(call $(LOCAL_2ND_ARCH_VAR_PREFIX)convert-to-$(my_host)clang-flags,$(normal_objects_cflags))

endif

core/combo/include/arch/darwin-x86/AndroidConfig.h

+0 −6
Original line number Diff line number Diff line
@@ -163,12 +163,6 @@ 
 */

#define HAVE_CXXABI 0



/*

 * Defined if we have the gettid() system call.

 */

/* #define HAVE_GETTID */





/*

 * Add any extra platform-specific defines here.

 */

core/combo/include/arch/linux-arm/AndroidConfig.h

+0 −5
Original line number Diff line number Diff line
@@ -172,11 +172,6 @@ 
 */

#define HAVE_CXXABI 0



/*

 * Defined if we have the gettid() system call.

 */

#define HAVE_GETTID



/* 

 * Defined if we have the sched_setscheduler() call

 */

core/combo/include/arch/linux-arm64/AndroidConfig.h

+0 −5
Original line number Diff line number Diff line
@@ -174,11 +174,6 @@ 
 */

#define HAVE_CXXABI 0



/*

 * Defined if we have the gettid() system call.

 */

#define HAVE_GETTID



/*

 * Defined if we have the sched_setscheduler() call

 */

core/combo/include/arch/linux-mips/AndroidConfig.h

+0 −5
Original line number Diff line number Diff line
@@ -177,11 +177,6 @@ 
 */

#define HAVE_CXXABI 0



/*

 * Defined if we have the gettid() system call.

 */

#define HAVE_GETTID



/*

 * Defined if we have the sched_setscheduler() call

 */