Remove USE_CLANG_LLD[=false]
Test: treehugger
Change-Id: I6dd632e9501f82b22f3f0c084039808e37b37742
diff --git a/core/soong_config.mk b/core/soong_config.mk
index 2d7c0d9..2f978fa 100644
--- a/core/soong_config.mk
+++ b/core/soong_config.mk
@@ -102,7 +102,6 @@
$(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))
diff --git a/core/use_lld_setup.mk b/core/use_lld_setup.mk
index 5f0f412..2026f31 100644
--- a/core/use_lld_setup.mk
+++ b/core/use_lld_setup.mk
@@ -1,21 +1,16 @@
#############################################################
-## 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