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

Commit bbd1a8a2 authored by Aravind Asam's avatar Aravind Asam Committed by Linux Build Service Account
Browse files

Build options for enabling proprietary Clang compiler 

Needed for enabling proprietary Clang compiler

Change-Id: I33a6a4c4c40722ce66dd7398ff647c33e5dfbdea
parent 17e16295

core/binary.mk

+16 −0
Original line number Diff line number Diff line
@@ -209,6 +209,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_qcclang := $(strip $(LOCAL_QCCLANG))



# clang is enabled by default for host builds

# enable it unless we've specifically disabled clang above

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





ifeq ($(QCCLANG),true)

    ifeq ($(my_qcclang),)

        my_qcclang := 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)
@@ -326,6 +334,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_qcclang),true)

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

            my_cc := $(QCCLANG_PATH)/clang -mno-ae

        endif

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

            my_cxx := $(QCCLANG_PATH)/clang++ -mno-ae

        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

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

LOCAL_CTS_TEST_RUNNER:=

LOCAL_CLANG:=

LOCAL_QCCLANG:=

LOCAL_JAR_EXCLUDE_FILES:=

LOCAL_JAR_PACKAGES:=

LOCAL_JAR_EXCLUDE_PACKAGES:=