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

Commit 5bb3a519 authored by Chih-hung Hsieh's avatar Chih-hung Hsieh Committed by android-build-merger
Browse files

Merge "Third try to enable clang lld as default linker." am: 50465681 am: 378da0f3 

am: 0118d2e3

Change-Id: Ia6b2e157fd9e6454b2821cc2af21a0e0a6c1fa5f
parents 6e21fe70 0118d2e3

core/soong_config.mk

+1 −1
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ $(call add_json_list, CFIExcludePaths, $(CFI_EXCLUDE_PATHS) $( 
$(call add_json_list, CFIIncludePaths,                   $(CFI_INCLUDE_PATHS) $(PRODUCT_CFI_INCLUDE_PATHS))

$(call add_json_list, IntegerOverflowExcludePaths,       $(INTEGER_OVERFLOW_EXCLUDE_PATHS) $(PRODUCT_INTEGER_OVERFLOW_EXCLUDE_PATHS))



$(call add_json_bool, UseClangLld,                       $(filter 1 true,$(USE_CLANG_LLD)))

$(call add_json_bool, UseClangLld,                       $(call invert_bool,$(filter 0 false,$(USE_CLANG_LLD))))

$(call add_json_bool, ClangTidy,                         $(filter 1 true,$(WITH_TIDY)))

$(call add_json_str,  TidyChecks,                        $(WITH_TIDY_CHECKS))

core/use_lld_setup.mk

+11 −6
Original line number Diff line number Diff line
@@ -4,12 +4,17 @@ 
## Output variables: my_use_clang_lld

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



# Use LLD only if it's not disabled by LOCAL_USE_CLANG_LLD,

# and enabled by LOCAL_USE_CLANG_LLD or USE_CLANG_LLD.

my_use_clang_lld := false

ifeq (,$(filter 0 false,$(LOCAL_USE_CLANG_LLD)))

  ifneq (,$(filter 1 true,$(LOCAL_USE_CLANG_LLD) $(USE_CLANG_LLD)))

# Use LLD by default.

# Do not use LLD if LOCAL_USE_CLANG_LLD is false or 0,

# of if LOCAL_USE_CLANG_LLD is not set and USE_CLANG_LLD is 0 or false.

my_use_clang_lld := true

ifneq (,$(LOCAL_USE_CLANG_LLD))

  ifneq (,$(filter 0 false,$(LOCAL_USE_CLANG_LLD)))

    my_use_clang_lld := false

  endif

else

  ifneq (,$(filter 0 false,$(USE_CLANG_LLD)))

    my_use_clang_lld := false

  endif

endif