summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYi Kong <yikong@google.com>2024-03-27 01:58:09 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2024-03-27 01:58:09 +0000
commit564011d100ce691179e31bfaaa86d39a32a3d2b1 (patch)
tree8d0870a1205f545d68a6387cf03c946105b930fd
parentbd95f1afc4f618b1f5ca1e083688f4edab245b34 (diff)
parent93dd787ac3983ee7e2b4fa7d67cb2c4c42e5ea27 (diff)
downloadbase-564011d100ce691179e31bfaaa86d39a32a3d2b1.tar.gz
Merge "Revert "Revert "Workaround build breakage from full LTO optimiza..."" into main
-rw-r--r--media/jni/Android.bp3
-rw-r--r--media/jni/audioeffect/Android.bp3
2 files changed, 6 insertions, 0 deletions
diff --git a/media/jni/Android.bp b/media/jni/Android.bp
index 94fce797f5d6..d6d74e8a087a 100644
--- a/media/jni/Android.bp
+++ b/media/jni/Android.bp
@@ -122,6 +122,9 @@ cc_library_shared {
"-Wunused",
"-Wunreachable-code",
],
+
+ // TODO(b/330503129) Workaround build breakage.
+ lto_O0: true,
}
cc_library_shared {
diff --git a/media/jni/audioeffect/Android.bp b/media/jni/audioeffect/Android.bp
index cf5059ceb3c9..7caa9e4863f9 100644
--- a/media/jni/audioeffect/Android.bp
+++ b/media/jni/audioeffect/Android.bp
@@ -44,4 +44,7 @@ cc_library_shared {
"-Wunreachable-code",
"-DANDROID_UTILS_REF_BASE_DISABLE_IMPLICIT_CONSTRUCTION",
],
+
+ // TODO(b/330503129) Workaround LTO build breakage.
+ lto_O0: true,
}