aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2016-04-19 23:06:48 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-04-19 23:06:48 +0000
commit86e2e9377cdaeca7ca0fb8db4a9029ebe5c5c751 (patch)
treed904ce32b07a43d38a9dafaae755b9b7c837041d
parent194b7e0abb447eee2c32bbc26d99000c8a8ea762 (diff)
parente4e99a3731619492ec1882fd85e63f1b76988fb2 (diff)
downloadgtest-86e2e9377cdaeca7ca0fb8db4a9029ebe5c5c751.tar.gz
Merge "Update sanitize property format" am: edbd10348f
am: e4e99a3731 * commit 'e4e99a3731619492ec1882fd85e63f1b76988fb2': Update sanitize property format Change-Id: Iec91b0be95385b7f7577492a43f6197ade627b80
-rw-r--r--Android.bp8
1 files changed, 6 insertions, 2 deletions
diff --git a/Android.bp b/Android.bp
index c892f22..ba6542c 100644
--- a/Android.bp
+++ b/Android.bp
@@ -147,7 +147,9 @@ cc_library_static {
srcs: ["src/gtest-all.cc"],
- sanitize: ["never"],
+ sanitize: {
+ never: true,
+ },
rtti: true,
}
@@ -163,7 +165,9 @@ cc_library_static {
srcs: ["src/gtest_main.cc"],
- sanitize: ["never"],
+ sanitize: {
+ never: true,
+ },
}
// Legacy libraries for makefiles that refer to libgtest_host