summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Yi Kong <yikong@google.com> 2023-11-27 15:26:05 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-11-27 15:26:05 +0000
commit9768f8643692d94c9f6283ae06a2f11c70489b9d (patch)
tree9e47cd32d7c9f597c626f7fa46a253e1ac163385
parent91c628b2bc9ef120bec433694316bd8ff287a24f (diff)
parent6b5d8e0be5e16b9c12fe6d0b4a52acbf17c7eb46 (diff)
Merge "Re-enable ThinLTO for libmedia_jni and libaudioeffect_jni" into main am: d4b03ad73c am: 6b5d8e0be5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2839600 Change-Id: Id4548f988e23ed7b7678c73c32032407049a40d7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--media/jni/Android.bp5
-rw-r--r--media/jni/audioeffect/Android.bp5
2 files changed, 0 insertions, 10 deletions
diff --git a/media/jni/Android.bp b/media/jni/Android.bp
index 6031ef70535d..94fce797f5d6 100644
--- a/media/jni/Android.bp
+++ b/media/jni/Android.bp
@@ -122,11 +122,6 @@ cc_library_shared {
"-Wunused",
"-Wunreachable-code",
],
-
- // Workaround Clang LTO crash.
- lto: {
- never: true,
- },
}
cc_library_shared {
diff --git a/media/jni/audioeffect/Android.bp b/media/jni/audioeffect/Android.bp
index 8b5b726fd2db..cf5059ceb3c9 100644
--- a/media/jni/audioeffect/Android.bp
+++ b/media/jni/audioeffect/Android.bp
@@ -44,9 +44,4 @@ cc_library_shared {
"-Wunreachable-code",
"-DANDROID_UTILS_REF_BASE_DISABLE_IMPLICIT_CONSTRUCTION",
],
-
- // Workaround Clang LTO crash.
- lto: {
- never: true,
- },
}