diff options
| author | 2023-11-27 16:14:55 +0000 | |
|---|---|---|
| committer | 2023-11-27 16:14:55 +0000 | |
| commit | 5f317749db15e16483e5433c5b698307519af8f7 (patch) | |
| tree | ea8ea61a5ddd786cbd11f2d37d899d2e6373f6c8 | |
| parent | e6393d5ab449c0a973c8a0dfe481854b6b61ba92 (diff) | |
| parent | 9768f8643692d94c9f6283ae06a2f11c70489b9d (diff) | |
Merge "Re-enable ThinLTO for libmedia_jni and libaudioeffect_jni" into main am: d4b03ad73c am: 6b5d8e0be5 am: 9768f86436
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2839600
Change-Id: Iabb5d11071a1aef4f11073905f80c13f66e33fc0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | media/jni/Android.bp | 5 | ||||
| -rw-r--r-- | media/jni/audioeffect/Android.bp | 5 |
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, - }, } |