p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove USE_CLANG_LLD[=false] 

Test: treehugger
Change-Id: I6dd632e9501f82b22f3f0c084039808e37b37742
This commit is contained in:
Dan Willemsen 2018-10-21 19:46:36 -07:00
parent f1dafa30e4
commit 2eea59973b
2 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/soong_config.mk
View File

@ -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, 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_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_bool, ClangTidy, $(filter 1 true,$(WITH_TIDY)))
$(call add_json_str, TidyChecks, $(WITH_TIDY_CHECKS)) $(call add_json_str, TidyChecks, $(WITH_TIDY_CHECKS))

11
core/use_lld_setup.mk
View File

@ -1,21 +1,16 @@
############################################################# #############################################################
## Set up flags based on USE_CLANG_LLD and LOCAL_USE_CLANG_LLD. ## Set up flags based on LOCAL_USE_CLANG_LLD.
## Input variables: USE_CLANG_LLD,LOCAL_USE_CLANG_LLD. ## Input variables: LOCAL_USE_CLANG_LLD
## Output variables: my_use_clang_lld ## Output variables: my_use_clang_lld
############################################################# #############################################################
# Use LLD by default. # Use LLD by default.
# Do not use LLD if LOCAL_USE_CLANG_LLD is false or 0, # 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 my_use_clang_lld := true
ifneq (,$(LOCAL_USE_CLANG_LLD)) ifneq (,$(LOCAL_USE_CLANG_LLD))
ifneq (,$(filter 0 false,$(LOCAL_USE_CLANG_LLD))) ifneq (,$(filter 0 false,$(LOCAL_USE_CLANG_LLD)))
my_use_clang_lld := false my_use_clang_lld := false
endif endif
else
ifneq (,$(filter 0 false,$(USE_CLANG_LLD)))
my_use_clang_lld := false
endif
endif endif
# Do not use LLD for Darwin host executables or shared libraries. See # Do not use LLD for Darwin host executables or shared libraries. See