aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2016-04-19 23:04:43 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-04-19 23:04:43 +0000
commite4e99a3731619492ec1882fd85e63f1b76988fb2 (patch)
tree0ea81b0fc9a33eef280dd9be31ba2fb52bd5c83e
parent658729bc0290ac05ae59b66bb2eedce3ab99ada2 (diff)
parentedbd10348f7260d429b36e971e0d02da8a7378a4 (diff)
downloadgtest-e4e99a3731619492ec1882fd85e63f1b76988fb2.tar.gz
Merge "Update sanitize property format"
am: edbd10348f * commit 'edbd10348f7260d429b36e971e0d02da8a7378a4': Update sanitize property format Change-Id: If026b2fd13de3529e883a22dc5eba00365932eae
-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