summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Yi Kong <yikong@google.com> 2022-08-22 17:28:18 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2022-08-22 17:28:18 +0000
commit660cd620b0e8502e2348fb3ad0df334e9f14ac8c (patch)
tree92d98e2849d125966f579f1f142411ec0483f8b6
parent6cf13233fefa5141f136b6d5446ae3d9e755d4fa (diff)
parentc0b982f4ca844d82b04ac0d64c6414bfc5721372 (diff)
Merge "Turn off LTO for libviabratorservice as a workaround"
-rw-r--r--services/vibratorservice/Android.bp6
-rw-r--r--services/vibratorservice/test/Android.bp5
2 files changed, 6 insertions, 5 deletions
diff --git a/services/vibratorservice/Android.bp b/services/vibratorservice/Android.bp
index 2002bdf628..5403baf2e7 100644
--- a/services/vibratorservice/Android.bp
+++ b/services/vibratorservice/Android.bp
@@ -59,6 +59,12 @@ cc_library_shared {
"-Wunreachable-code",
],
+ // FIXME: Workaround LTO build breakage
+ // http://b/241699694
+ lto: {
+ never: true,
+ },
+
local_include_dirs: ["include"],
export_include_dirs: ["include"],
diff --git a/services/vibratorservice/test/Android.bp b/services/vibratorservice/test/Android.bp
index adba3dbcd5..32947246d8 100644
--- a/services/vibratorservice/test/Android.bp
+++ b/services/vibratorservice/test/Android.bp
@@ -57,9 +57,4 @@ cc_test {
static_libs: [
"libgmock",
],
- // FIXME: Workaround LTO build breakage
- // http://b/241699694
- lto: {
- never: true,
- },
}