commit 660cd620b0e8502e2348fb3ad0df334e9f14ac8c
author Yi Kong <yikong@google.com> Mon Aug 22 17:28:18 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Aug 22 17:28:18 2022 +0000
tree 92d98e2849d125966f579f1f142411ec0483f8b6
parent 6cf13233fefa5141f136b6d5446ae3d9e755d4fa
parent c0b982f4ca844d82b04ac0d64c6414bfc5721372

Merge "Turn off LTO for libviabratorservice as a workaround"

services/vibratorservice/Android.bp

diff --git a/services/vibratorservice/Android.bp b/services/vibratorservice/Android.bp
index 2002bdf..5403baf 100644
--- a/services/vibratorservice/Android.bp
+++ b/services/vibratorservice/Android.bp
@@ -59,6 +59,12 @@
         "-Wunreachable-code",
     ],
 
+    // FIXME: Workaround LTO build breakage
+    // http://b/241699694
+    lto: {
+        never: true,
+    },
+
     local_include_dirs: ["include"],
 
     export_include_dirs: ["include"],

services/vibratorservice/test/Android.bp

diff --git a/services/vibratorservice/test/Android.bp b/services/vibratorservice/test/Android.bp
index adba3db..3294724 100644
--- a/services/vibratorservice/test/Android.bp
+++ b/services/vibratorservice/test/Android.bp
@@ -57,9 +57,4 @@
     static_libs: [
         "libgmock",
     ],
-    // FIXME: Workaround LTO build breakage
-    // http://b/241699694
-    lto: {
-        never: true,
-    },
 }