commit 6c520a7ab5e186f293dc08a94e876a7a95e8b11a
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Mon Jun 17 14:44:22 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jun 17 14:44:22 2024 +0000
tree eb7fbddb6ec3d309ed5188a9569d7f2a81a7a317
parent d1d1f825f83b5b15f1fdf3ac575f13338cecdecd
parent beaf3c45f297cc1ec020875d308b6c618e856908

Merge "Remove local LTO workaround" into main

Android.bp

diff --git a/Android.bp b/Android.bp
index 56676ff..9cf2380 100644
--- a/Android.bp
+++ b/Android.bp
@@ -177,26 +177,9 @@
     },
 }
 
-// TODO: Remove this when b/328163089 is fixed.
-// Thin lto will be enabled by default in the future.
-cc_defaults {
-    name: "libz_thin_lto_defaults",
-
-    target: {
-        android_arm64: {
-            lto: {
-                thin: true,
-            },
-        },
-    },
-}
-
 cc_library {
     name: "libz",
-    defaults: [
-        "libz_defaults",
-        "libz_thin_lto_defaults",
-    ],
+    defaults: ["libz_defaults"],
 
     whole_static_libs: ["libz_static"],
 
@@ -252,7 +235,6 @@
 // can and do differ over time.
 cc_library {
     name: "libz_stable",
-    defaults: ["libz_thin_lto_defaults"],
     visibility: [
         "//bootable/recovery/applypatch",
         "//bootable/recovery/tests",