Merge "Re-enable LTO for linker"

2021-11-04 10:34:31 +00:00 · 2021-11-04 10:34:31 +00:00 · 7d3f322e64
commit 7d3f322e64
parent fe95fe354f 9e33b76c67
2 changed files with 4 additions and 6 deletions
--- a/libc/Android.bp
+++ b/libc/Android.bp
@ -122,6 +122,10 @@ cc_defaults {
            cflags: ["-DUSE_SCUDO"],
        },
    },
+
+    lto: {
+        never: true,
+    },
 }

 libc_scudo_product_variables = {
@ -1782,9 +1786,6 @@ cc_library {
        "com.android.runtime",
    ],

-    lto: {
-        never: true,
-    },
    target: {
        native_bridge: {
            shared: {
--- a/linker/Android.bp
+++ b/linker/Android.bp
@ -391,9 +391,6 @@ cc_binary {
        },
    },

-    lto: {
-        never: true,
-    },
    pgo: {
        sampling: true,
    },