Disable CFI verification for unit tests that are using gtest+gmock
Apparently, the CFI verification crashes unit tests that
are using gtest+gmock. Interestingly, those tests succeed for 32-bit
binaries, and fail for 64-bit binaries.
Bug: 71739588
Test: Running the 64-bit version of the unit tests in test/run_unit_tests.sh
Change-Id: Id1f6b3667b3f9eabb0719e65aea18c6950de63a8
diff --git a/osi/Android.bp b/osi/Android.bp
index 8e5dbde..9b738f0 100644
--- a/osi/Android.bp
+++ b/osi/Android.bp
@@ -151,4 +151,7 @@
enabled: false,
}
},
+ sanitize: {
+ cfi: false,
+ },
}
diff --git a/service/Android.bp b/service/Android.bp
index 199a51b..37966af 100644
--- a/service/Android.bp
+++ b/service/Android.bp
@@ -144,6 +144,9 @@
],
},
},
+ sanitize: {
+ cfi: false,
+ },
}
// Native system service CLI for target
diff --git a/stack/Android.bp b/stack/Android.bp
index bdd1cfd..1bedd40 100644
--- a/stack/Android.bp
+++ b/stack/Android.bp
@@ -287,6 +287,9 @@
"liblog",
"libgmock",
],
+ sanitize: {
+ cfi: false,
+ },
}
// Bluetooth stack advertise data parsing unit tests for target
@@ -337,4 +340,7 @@
"libosi",
"libbt-protos",
],
+ sanitize: {
+ cfi: false,
+ },
}