From fa2aee1ca4cd07afaeaf669f96f6ecc4e66b9a1d Mon Sep 17 00:00:00 2001
From: Dan Willemsen <dwillemsen@google.com>
Date: Sun, 21 Oct 2018 19:47:01 -0700
Subject: [PATCH] Remove USE_CLANG_LLD[=false]

This should always be true now. It will be a change for side branches
(build_tools, etc) that weren't setting UseClangLld in the
soong.variables file.

Test: treehugger
Change-Id: I9fd6157fda630bf8bb939677dbcb026f02685f19
---
 android/config.go   | 4 ----
 android/variable.go | 2 --
 cc/linker.go        | 2 +-
 cc/lto.go           | 2 +-
 4 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/android/config.go b/android/config.go
index 5da1e0bda..bea6f603f 100644
--- a/android/config.go
+++ b/android/config.go
@@ -646,10 +646,6 @@ func (c *config) TargetOpenJDK9() bool {
 	return c.targetOpenJDK9
 }
 
-func (c *config) UseClangLld() bool {
-	return Bool(c.productVariables.UseClangLld)
-}
-
 func (c *config) ClangTidy() bool {
 	return Bool(c.productVariables.ClangTidy)
 }
diff --git a/android/variable.go b/android/variable.go
index 8faeb0375..476171bfb 100644
--- a/android/variable.go
+++ b/android/variable.go
@@ -201,8 +201,6 @@ type productVariables struct {
 	ProductPath         *string `json:",omitempty"`
 	ProductServicesPath *string `json:",omitempty"`
 
-	UseClangLld *bool `json:",omitempty"`
-
 	ClangTidy  *bool   `json:",omitempty"`
 	TidyChecks *string `json:",omitempty"`
 
diff --git a/cc/linker.go b/cc/linker.go
index 2e1828aba..28f474775 100644
--- a/cc/linker.go
+++ b/cc/linker.go
@@ -289,7 +289,7 @@ func (linker *baseLinker) useClangLld(ctx ModuleContext) bool {
 	if linker.Properties.Use_clang_lld != nil {
 		return Bool(linker.Properties.Use_clang_lld)
 	}
-	return ctx.Config().UseClangLld()
+	return true
 }
 
 // ModuleContext extends BaseModuleContext
diff --git a/cc/lto.go b/cc/lto.go
index fd2a86945..52b9a34d2 100644
--- a/cc/lto.go
+++ b/cc/lto.go
@@ -76,7 +76,7 @@ func (lto *lto) useClangLld(ctx BaseModuleContext) bool {
 	if lto.Properties.Use_clang_lld != nil {
 		return Bool(lto.Properties.Use_clang_lld)
 	}
-	return ctx.Config().UseClangLld()
+	return true
 }
 
 func (lto *lto) flags(ctx BaseModuleContext, flags Flags) Flags {