summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYi Kong <yikong@google.com>2024-03-22 11:30:46 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2024-03-22 11:30:52 +0000
commit93dd787ac3983ee7e2b4fa7d67cb2c4c42e5ea27 (patch)
tree3ad0a04ae3c51e456fe8ee9710dbb50c7ff05218
parent59bcc5338c85c425ecfbebd82995d12824e5cd9f (diff)
downloadbase-93dd787ac3983ee7e2b4fa7d67cb2c4c42e5ea27.tar.gz
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
-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,
}