commit f2f419e39f0e565a36d9eacd4214b4e29ee3ef22
author Yi Kong <yikong@google.com> Thu Mar 28 06:10:30 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Mar 28 06:10:37 2024 +0000
tree 3ad0a04ae3c51e456fe8ee9710dbb50c7ff05218
parent 5b249369b18e236de72523879881f77eba8c6ced

Revert "Revert "Revert "Revert "Workaround build breakage from f..."

Revert submission 3016846-revert-3009938-revert-3002586-revert-2988057-default-full-lto-DWADZBGWJG-UPWNCWKHFI-WRHJNZSOTO

Reason for revert: Reland with fix

Reverted changes: /q/submissionid:3016846-revert-3009938-revert-3002586-revert-2988057-default-full-lto-DWADZBGWJG-UPWNCWKHFI-WRHJNZSOTO

Change-Id: I83c1dc4ac6b988c6f1fa2a6cb026ef862b0e448a

media/jni/Android.bp

diff --git a/media/jni/Android.bp b/media/jni/Android.bp
index 94fce79..d6d74e8 100644
--- a/media/jni/Android.bp
+++ b/media/jni/Android.bp
@@ -122,6 +122,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,
 }