summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Yi Kong <yikong@google.com> 2022-08-22 18:05:42 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-08-22 18:05:42 +0000
commit304889b04e776ebb59e464e5627bb302d1cbf6f0 (patch)
tree92d98e2849d125966f579f1f142411ec0483f8b6
parent02b70b16c5370f171e31704012e1a34d80538aa0 (diff)
parentf2cee2b1e0fa4236f0165698ff4f2045eafbe093 (diff)
Merge "Turn off LTO for libviabratorservice as a workaround" am: 660cd620b0 am: f2cee2b1e0
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2191798 Change-Id: I41bc69d2ae78b7bcb9dfc66618fef8e55174dc7c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-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,
- },
}