Merge "Workaround global ThinLTO build break"

2020-10-01 04:04:35 +00:00
parent 8827badd30 cd1e70b874
commit 06c47e70a4
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,
+    },
 }