commit b52515830da6688524bfde8bb79f1fa781451cda
author Elliott Hughes <enh@google.com> Mon Jan 11 10:19:28 2021 -0800
committer Elliott Hughes <enh@google.com> Tue Jan 12 17:19:13 2021 +0000
tree 6febcf8c2d27fe8775f257e0ff3c68097b55e71e
parent 8ef84f233a55972eb3a3d84c11c1617531af8e92

lld is the only choice, and has been for a while.

Bug: http://b/148819762
Test: treehugger
Change-Id: Ie071c069da80666f79db49ae298cbf6e86cdd86f

dex2oat/Android.bp

diff --git a/dex2oat/Android.bp b/dex2oat/Android.bp
index 76ca050..b73985e 100644
--- a/dex2oat/Android.bp
+++ b/dex2oat/Android.bp
@@ -399,11 +399,6 @@
         "dex2oats-defaults",
     ],
     static_libs: ["libdex2oatd_static"],
-    target: {
-        linux_glibc_x86_64: {
-            use_clang_lld: true,
-        },
-    },
 }
 
 art_cc_library_static {

oatdump/Android.bp

diff --git a/oatdump/Android.bp b/oatdump/Android.bp
index f955900..4008a0f 100644
--- a/oatdump/Android.bp
+++ b/oatdump/Android.bp
@@ -185,11 +185,6 @@
         "libartd-dexlayout_static_defaults",
         "oatdumps-defaults",
     ],
-    target: {
-        linux_glibc_x86_64: {
-            use_clang_lld: true,
-        },
-    },
     static_libs: [
         "libartd-disassembler",
         "libvixld",