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

Commit 11797c1c authored by Dan Willemsen's avatar Dan Willemsen Committed by android-build-merger
Browse files

Merge "Remove USE_CLANG_LLD[=false]" 

am: 4c95ffa8

Change-Id: I039c724fa51651e4c800337c5b5b83541755679a
parents 19751a16 4c95ffa8

core/soong_config.mk

+0 −1
Original line number Diff line number Diff line
@@ -102,7 +102,6 @@ $(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,                       $(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

+3 −8
Original line number Diff line number Diff line 
#############################################################

## Set up flags based on USE_CLANG_LLD and LOCAL_USE_CLANG_LLD.

## Input variables: USE_CLANG_LLD,LOCAL_USE_CLANG_LLD.

## Set up flags based on LOCAL_USE_CLANG_LLD.

## Input variables: LOCAL_USE_CLANG_LLD

## Output variables: my_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.

# Do not use LLD if LOCAL_USE_CLANG_LLD is false or 0

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



# Do not use LLD for Darwin host executables or shared libraries.  See