commit d6c2afcf9ac82c34288cb7c6c4ca782aa4937d62
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Fri Mar 22 09:28:05 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Mar 22 09:28:05 2024 +0000
tree bb5df3e1fee2b0c28547c73478e5cb5928197e07
parent a9879734a1bc85a17c4a320f0754500bdb3e0e5e
parent 11bb56ec5cbdcfd59f24179f536213040ea7f63b

Merge "Revert "Workaround build breakage from full LTO optimization"" into main am: 11bb56ec5c

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3002587

Change-Id: Iea788d96cb39c3b2683c332d7f1756f416d89f18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

media/jni/Android.bp

diff --git a/media/jni/Android.bp b/media/jni/Android.bp
index d6d74e8..94fce79 100644
--- a/media/jni/Android.bp
+++ b/media/jni/Android.bp
@@ -122,9 +122,6 @@
         "-Wunused",
         "-Wunreachable-code",
     ],
-
-    // TODO(b/330503129) Workaround build breakage.
-    lto_O0: true,
 }
 
 cc_library_shared {

media/jni/audioeffect/Android.bp

diff --git a/media/jni/audioeffect/Android.bp b/media/jni/audioeffect/Android.bp
index 7caa9e4..cf5059c 100644
--- a/media/jni/audioeffect/Android.bp
+++ b/media/jni/audioeffect/Android.bp
@@ -44,7 +44,4 @@
         "-Wunreachable-code",
         "-DANDROID_UTILS_REF_BASE_DISABLE_IMPLICIT_CONSTRUCTION",
     ],
-
-    // TODO(b/330503129) Workaround LTO build breakage.
-    lto_O0: true,
 }