commit df34b5371ede1a8bc6a6489edef906a9cbc28a84
author Pirama Arumuga Nainar <pirama@google.com> Fri Jun 14 21:54:50 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jun 14 21:54:50 2024 +0000
tree c17fe0e6d4f8d520e4519b69dbf7e1ad8e9da540
parent 6870708b4bfdef3813d343958ae20df9c5ae45c9
parent f2f419e39f0e565a36d9eacd4214b4e29ee3ef22

Merge "Revert "Revert "Revert "Revert "Workaround build breakage from f..."" into main

media/jni/Android.bp

diff --git a/media/jni/Android.bp b/media/jni/Android.bp
index e440501..2141516 100644
--- a/media/jni/Android.bp
+++ b/media/jni/Android.bp
@@ -125,6 +125,9 @@
         "-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 cf5059c..7caa9e4 100644
--- a/media/jni/audioeffect/Android.bp
+++ b/media/jni/audioeffect/Android.bp
@@ -44,4 +44,7 @@
         "-Wunreachable-code",
         "-DANDROID_UTILS_REF_BASE_DISABLE_IMPLICIT_CONSTRUCTION",
     ],
+
+    // TODO(b/330503129) Workaround LTO build breakage.
+    lto_O0: true,
 }