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
diff --git a/android/config.go b/android/config.go
index 5da1e0b..bea6f60 100644
--- a/android/config.go
+++ b/android/config.go
@@ -646,10 +646,6 @@
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 8faeb03..476171b 100644
--- a/android/variable.go
+++ b/android/variable.go
@@ -201,8 +201,6 @@
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 2e1828a..28f4747 100644
--- a/cc/linker.go
+++ b/cc/linker.go
@@ -289,7 +289,7 @@
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 fd2a869..52b9a34 100644
--- a/cc/lto.go
+++ b/cc/lto.go
@@ -76,7 +76,7 @@
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 {