Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5e9b20e7 authored Jan 09, 2018 by Pavlin Radoslavov

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

parent e155d2af

system/osi/Android.bp

+3 −0

Original line number	Diff line number	Diff line
		@@ -151,4 +151,7 @@ cc_test {
		enabled: false,
		}
		},
		sanitize: {
		cfi: false,
		},
		}

system/service/Android.bp

+3 −0

Original line number	Diff line number	Diff line
		@@ -144,6 +144,9 @@ cc_test {
		],
		},
		},
		sanitize: {
		cfi: false,
		},
		}

		// Native system service CLI for target

system/stack/Android.bp

+6 −0

Original line number	Diff line number	Diff line
		@@ -287,6 +287,9 @@ cc_test {
		"liblog",
		"libgmock",
		],
		sanitize: {
		cfi: false,
		},
		}

		// Bluetooth stack advertise data parsing unit tests for target
		@@ -337,4 +340,7 @@ cc_test {
		"libosi",
		"libbt-protos",
		],
		sanitize: {
		cfi: false,
		},
		}