Revert "Revert "Revert "Set global default to use lld."""
This reverts commit da8febf39cbd910e3c6af1de76d50e4f60d71d66.
Bug: http://b/73768157
Reason for revert: breaks several bionic/debuggerd/libunwind_stack gtests
Change-Id: I161cf85cf352b80644524fd4bb70ff7c75fbc1d0
diff --git a/core/use_lld_setup.mk b/core/use_lld_setup.mk
index 464726c..17a9e27 100644
--- a/core/use_lld_setup.mk
+++ b/core/use_lld_setup.mk
@@ -4,17 +4,12 @@
## Output variables: my_use_clang_lld
#############################################################
-# 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
+# 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
endif
endif