Merge "Set global default to use lld."
This commit is contained in:
commit
1defe63536
2 changed files with 12 additions and 7 deletions
|
@ -101,7 +101,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))
|
||||
|
||||
|
|
|
@ -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)))
|
||||
my_use_clang_lld := true
|
||||
# Use LLD by default.
|
||||
# Do not use LLD if LOCAL_USE_CLANG_LLD is false or 0,
|
||||
# or 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
|
||||
|
||||
|
|
Loading…
Reference in a new issue