summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Pirama Arumuga Nainar <pirama@google.com> 2024-06-14 21:54:50 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2024-06-14 21:54:50 +0000
commitdf34b5371ede1a8bc6a6489edef906a9cbc28a84 (patch)
treec17fe0e6d4f8d520e4519b69dbf7e1ad8e9da540
parent6870708b4bfdef3813d343958ae20df9c5ae45c9 (diff)
parentf2f419e39f0e565a36d9eacd4214b4e29ee3ef22 (diff)
Merge "Revert "Revert "Revert "Revert "Workaround build breakage from f..."" 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 e4405012cfee..21415166d4ed 100644
--- a/media/jni/Android.bp
+++ b/media/jni/Android.bp
@@ -125,6 +125,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,
}