summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Chungro Lee <chungro@google.com> 2024-03-28 01:51:25 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2024-03-28 01:51:25 +0000
commitab4e34802106db701694f9667ebfe83152ad19b2 (patch)
tree7e3619b19e7810a3943b47a794284eb2a6f92048
parent9d9caa8b704d6ac05b0f0c4ae6a5ba3cd416d89d (diff)
parent63d84d2d522af56fdd8e0aaa8c0bfb2f2d808e74 (diff)
Merge "Revert "Revert "Revert "Workaround build breakage from full LTO ..."" into main am: 63d84d2d52
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3016847 Change-Id: I94171e322c61d5dc175397cc119a137948b636da Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--media/jni/Android.bp3
-rw-r--r--media/jni/audioeffect/Android.bp3
2 files changed, 0 insertions, 6 deletions
diff --git a/media/jni/Android.bp b/media/jni/Android.bp
index d6d74e8a087a..94fce797f5d6 100644
--- a/media/jni/Android.bp
+++ b/media/jni/Android.bp
@@ -122,9 +122,6 @@ 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 7caa9e4863f9..cf5059ceb3c9 100644
--- a/media/jni/audioeffect/Android.bp
+++ b/media/jni/audioeffect/Android.bp
@@ -44,7 +44,4 @@ cc_library_shared {
"-Wunreachable-code",
"-DANDROID_UTILS_REF_BASE_DISABLE_IMPLICIT_CONSTRUCTION",
],
-
- // TODO(b/330503129) Workaround LTO build breakage.
- lto_O0: true,
}