diff options
| author | Yi Kong <yikong@google.com> | 2020-10-01 07:48:26 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-10-01 07:48:26 +0000 |
| commit | 2405f41b5720417eb8ca90ed18da74c8a0a1c785 (patch) | |
| tree | 3960dbd2e930819e6ac871781b6d9dd3dc533e4c | |
| parent | a6bc5361b7175485410db5fa0f67436d2fb9f413 (diff) | |
| parent | 78edf529282505a0caf3bbc2433601e0f27ca875 (diff) | |
Merge "Workaround global ThinLTO build break" am: 06c47e70a4 am: 78edf52928
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1442736
Change-Id: Ie0570c14afdc1e0b5440deb521a4491a2bc78c65
| -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, + }, } |