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
2020-10-01 07:48:26 +00:00
parent a6bc5361b7 78edf52928
commit 2405f41b57
3 changed files with 15 additions and 0 deletions
--- 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,
+    },
 }
--- 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 {
--- 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,
+    },
 }