summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYi Kong <yikong@google.com>2024-03-22 02:15:46 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2024-03-22 02:15:46 +0000
commitc6d81a35d70971691c7afe623e5e298606c9793a (patch)
tree0c7b5ada70935ab5a74d13a1b8a5b76597f86363
parent356e0e163a2a9f59288ae7b225ebe91addb33111 (diff)
parentb39da32834230b921dfe7078e4087187365753e2 (diff)
downloadbase-c6d81a35d70971691c7afe623e5e298606c9793a.tar.gz
Merge "Workaround build breakage from full LTO optimization" 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,
}