diff options
| author | 2020-10-01 08:07:49 +0000 | |
|---|---|---|
| committer | 2020-10-01 08:07:49 +0000 | |
| commit | 198e7d360f114ea11366efe31b96e29866152ade (patch) | |
| tree | 9f667e613e2dde38ba4f46aa88d11aaef8b924d1 | |
| parent | 9123ff8c6e22d8e0828ef50b3e21241f56e6dca9 (diff) | |
| parent | 2405f41b5720417eb8ca90ed18da74c8a0a1c785 (diff) | |
Merge "Workaround global ThinLTO build break" am: 06c47e70a4 am: 78edf52928 am: 2405f41b57
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1442736
Change-Id: Ie61fe46a15f2eb8a22c973e57757ec40dc44b90a
| -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, + }, } |