diff options
| author | Yi Kong <yikong@google.com> | 2020-10-01 08:56:04 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-10-01 08:56:04 +0000 |
| commit | 840761f7a447a64b5f07120c840f00008ec9e1fb (patch) | |
| tree | 179bc3057ea63e6e38e37d3b40a8b21233d68f25 | |
| parent | bcbad4f650de117d5e8e5c874c23ac5f57a7c839 (diff) | |
| parent | 198e7d360f114ea11366efe31b96e29866152ade (diff) | |
Merge "Workaround global ThinLTO build break" am: 06c47e70a4 am: 78edf52928 am: 2405f41b57 am: 198e7d360f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1442736
Change-Id: Ie009e43aa7ae340bf2fca180de637af0f2316521
| -rw-r--r-- | core/jni/Android.bp | 5 | ||||
| -rw-r--r-- | media/jni/Android.bp | 5 | ||||
| -rw-r--r-- | media/jni/audioeffect/Android.bp | 5 |
3 files changed, 15 insertions, 0 deletions
diff --git a/core/jni/Android.bp b/core/jni/Android.bp index f0f1b74c37b3..1968146099ae 100644 --- a/core/jni/Android.bp +++ b/core/jni/Android.bp @@ -315,4 +315,9 @@ cc_library_shared { cflags: ["-DANDROID_EXPERIMENTAL_MTE"], }, }, + + // Workaround Clang LTO crash. + lto: { + never: true, + }, } diff --git a/media/jni/Android.bp b/media/jni/Android.bp index d2294b38d992..d3466702ebf2 100644 --- a/media/jni/Android.bp +++ b/media/jni/Android.bp @@ -96,6 +96,11 @@ 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 5ba5c0159275..40e4c54c2921 100644 --- a/media/jni/audioeffect/Android.bp +++ b/media/jni/audioeffect/Android.bp @@ -28,4 +28,9 @@ cc_library_shared { "-Wunused", "-Wunreachable-code", ], + + // Workaround Clang LTO crash. + lto: { + never: true, + }, } |