commit 7d3f322e64ea1d51a465d2cac1ba2905977bdc49
author Yi Kong <yikong@google.com> Thu Nov 04 10:34:31 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Nov 04 10:34:31 2021 +0000
tree 4ec021f5d6ae62203c8497658a449f7952a954f5
parent fe95fe354f085ede5dee1306ea1591514a72ae2b
parent 9e33b76c67638bdc740ed967e53c8c6489dcbbd3

Merge "Re-enable LTO for linker"

libc/Android.bp

diff --git a/libc/Android.bp b/libc/Android.bp
index 36d2019..00904aa 100644
--- a/libc/Android.bp
+++ b/libc/Android.bp
@@ -122,6 +122,10 @@
             cflags: ["-DUSE_SCUDO"],
         },
     },
+
+    lto: {
+        never: true,
+    },
 }
 
 libc_scudo_product_variables = {
@@ -1782,9 +1786,6 @@
         "com.android.runtime",
     ],
 
-    lto: {
-        never: true,
-    },
     target: {
         native_bridge: {
             shared: {

linker/Android.bp

diff --git a/linker/Android.bp b/linker/Android.bp
index f6f86fb..3ceafc7 100644
--- a/linker/Android.bp
+++ b/linker/Android.bp
@@ -391,9 +391,6 @@
         },
     },
 
-    lto: {
-        never: true,
-    },
     pgo: {
         sampling: true,
     },