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

Commit 5ae25c70 authored by Steve Kondik's avatar Steve Kondik
Browse files

Merge branch 'LA.UM.5.5_rb1.10' of git://codeaurora.org/platform/build into cm-14.0

parents 4ef7a5c7 9ad9d8d0

core/binary.mk

+18 −2
Original line number Diff line number Diff line
@@ -218,6 +218,8 @@ ifdef LOCAL_CLANG_$($(my_prefix)$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH) 
my_clang := $(strip $(LOCAL_CLANG_$($(my_prefix)$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)))

endif



my_sdclang := $(strip $(LOCAL_SDCLANG))



# clang is enabled by default for host builds

# enable it unless we've specifically disabled clang above

ifdef LOCAL_IS_HOST_MODULE
@@ -260,6 +262,12 @@ endif 
my_cppflags := $(my_cpp_std_version) $(my_cppflags)





ifeq ($(SDCLANG),true)

    ifeq ($(my_sdclang),)

        my_sdclang := true

    endif

endif



# arch-specific static libraries go first so that generic ones can depend on them

my_static_libraries := $(LOCAL_STATIC_LIBRARIES_$($(my_prefix)$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)) $(LOCAL_STATIC_LIBRARIES_$(my_32_64_bit_suffix)) $(my_static_libraries)

my_whole_static_libraries := $(LOCAL_WHOLE_STATIC_LIBRARIES_$($(my_prefix)$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)) $(LOCAL_WHOLE_STATIC_LIBRARIES_$(my_32_64_bit_suffix)) $(my_whole_static_libraries)
@@ -270,8 +278,8 @@ include $(BUILD_SYSTEM)/cxx_stl_setup.mk 
ifdef LOCAL_HAL_STATIC_LIBRARIES

$(foreach lib, $(LOCAL_HAL_STATIC_LIBRARIES), \

    $(eval b_lib := $(filter $(lib).%,$(BOARD_HAL_STATIC_LIBRARIES)))\

    $(if $(b_lib), $(eval my_static_libraries += $(b_lib)),\

                   $(eval my_static_libraries += $(lib).default)))

    $(if $(b_lib), $(eval my_static_libraries := $(b_lib) $(my_static_libraries)),\

                   $(eval my_static_libraries := $(lib).default $(my_static_libraries))))

b_lib :=

endif
@@ -335,6 +343,14 @@ my_target_global_cflags := $($(LOCAL_2ND_ARCH_VAR_PREFIX)CLANG_TARGET_GLOBAL_CFL 
my_target_global_conlyflags := $($(LOCAL_2ND_ARCH_VAR_PREFIX)CLANG_TARGET_GLOBAL_CONLYFLAGS)

my_target_global_cppflags += $($(LOCAL_2ND_ARCH_VAR_PREFIX)CLANG_TARGET_GLOBAL_CPPFLAGS)

my_target_global_ldflags := $($(LOCAL_2ND_ARCH_VAR_PREFIX)CLANG_TARGET_GLOBAL_LDFLAGS)

    ifeq ($(my_sdclang),true)

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

            my_cc := $(SDCLANG_PATH)/clang $(SDLLVM_AE_FLAG) -Wno-vectorizer-no-neon

        endif

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

            my_cxx := $(SDCLANG_PATH)/clang++ $(SDLLVM_AE_FLAG) -Wno-vectorizer-no-neon

        endif

    endif

else

my_target_global_cflags := $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_GLOBAL_CFLAGS)

my_target_global_conlyflags := $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_GLOBAL_CONLYFLAGS)

core/clear_vars.mk

+3 −0
Original line number Diff line number Diff line
@@ -156,6 +156,9 @@ LOCAL_COMPATIBILITY_SUPPORT_FILES:= 
LOCAL_CTS_TEST_PACKAGE:=

LOCAL_CTS_TEST_RUNNER:=

LOCAL_CLANG:=

LOCAL_SDCLANG:=

LOCAL_SDCLANG_LTO:=

LOCAL_SDCLANG_EXTRA_FLAGS_32:=

LOCAL_JAR_EXCLUDE_FILES:=

LOCAL_JAR_PACKAGES:=

LOCAL_JAR_EXCLUDE_PACKAGES:=

core/executable.mk

+10 −0
Original line number Diff line number Diff line
@@ -42,6 +42,10 @@ endif 


my_skip_non_preferred_arch :=



ifeq ($(LOCAL_SDCLANG), true)

include $(SDCLANG_FLAG_DEFS)

endif



# check if preferred arch is supported

include $(BUILD_SYSTEM)/module_arch_supported.mk

ifeq ($(my_module_arch_supported),true)
@@ -80,4 +84,10 @@ LOCAL_NO_2ND_ARCH_MODULE_SUFFIX := 


my_module_arch_supported :=



ifeq ($(LOCAL_SDCLANG), true)

ifeq ($(LOCAL_SDCLANG_LTO), true)

include $(SDCLANG_LTO_DEFS)

endif

endif



endif

core/shared_library.mk

+10 −0
Original line number Diff line number Diff line
@@ -21,6 +21,10 @@ endif 
endif # my_module_multilib == both





ifeq ($(LOCAL_SDCLANG), true)

include $(SDCLANG_FLAG_DEFS)

endif



LOCAL_2ND_ARCH_VAR_PREFIX :=

include $(BUILD_SYSTEM)/module_arch_supported.mk
@@ -48,6 +52,12 @@ LOCAL_2ND_ARCH_VAR_PREFIX := 


endif # TARGET_2ND_ARCH



ifeq ($(LOCAL_SDCLANG), true)

ifeq ($(LOCAL_SDCLANG_LTO), true)

include $(SDCLANG_LTO_DEFS)

endif

endif



my_module_arch_supported :=



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

core/static_library.mk

+10 −0
Original line number Diff line number Diff line
@@ -6,6 +6,10 @@ ifndef my_module_multilib 
my_module_multilib := both

endif



ifeq ($(LOCAL_SDCLANG), true)

include $(SDCLANG_FLAG_DEFS)

endif



LOCAL_2ND_ARCH_VAR_PREFIX :=

include $(BUILD_SYSTEM)/module_arch_supported.mk
@@ -33,6 +37,12 @@ LOCAL_2ND_ARCH_VAR_PREFIX := 


endif # TARGET_2ND_ARCH



ifeq ($(LOCAL_SDCLANG), true)

ifeq ($(LOCAL_SDCLANG_LTO), true)

include $(SDCLANG_LTO_DEFS)

endif

endif



my_module_arch_supported :=



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