commit 93dd787ac3983ee7e2b4fa7d67cb2c4c42e5ea27
author Yi Kong <yikong@google.com> Fri Mar 22 11:30:46 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Mar 22 11:30:52 2024 +0000
tree 3ad0a04ae3c51e456fe8ee9710dbb50c7ff05218
parent 59bcc5338c85c425ecfbebd82995d12824e5cd9f

Revert "Revert "Workaround build breakage from full LTO optimiza..."

Revert submission 3002586-revert-2988057-default-full-lto-DWADZBGWJG

Reland with fix.

Reverted changes: /q/submissionid:3002586-revert-2988057-default-full-lto-DWADZBGWJG

Change-Id: I82598e6bb06138fb10b47f4b8d37d792f84e0cc7

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,
 }