commit ca154d66fcdcbf947ee4a9b024a3e9aaea857b86
author Elliott Hughes <enh@google.com> Tue Feb 14 15:46:33 2017 -0800
committer Elliott Hughes <enh@google.com> Tue Feb 14 15:46:33 2017 -0800
tree 2d8846a1d38cdb4a2afa0152addbb2cc492f30a4
parent 0a34d2f128a3213d08fd107b5b232aea20da1f48

Only sanitize Android.

Bug: N/A
Test: didn't
Change-Id: I9b9bc04112501eaa9f9ccf23152fc5d118b03000

base/Android.bp

diff --git a/base/Android.bp b/base/Android.bp
index a7600f3..694e029 100644
--- a/base/Android.bp
+++ b/base/Android.bp
@@ -37,9 +37,6 @@
     cppflags: libbase_cppflags,
     export_include_dirs: ["include"],
     shared_libs: ["liblog"],
-    sanitize: {
-        misc_undefined: ["integer"],
-    },
     target: {
         android: {
             srcs: [
@@ -47,6 +44,9 @@
                 "properties.cpp",
             ],
             cppflags: ["-Wexit-time-destructors"],
+            sanitize: {
+                misc_undefined: ["integer"],
+            },
         },
         darwin: {
             srcs: ["errors_unix.cpp"],
@@ -89,12 +89,12 @@
         "strings_test.cpp",
         "test_main.cpp",
     ],
-    sanitize: {
-        misc_undefined: ["integer"],
-    },
     target: {
         android: {
             srcs: ["properties_test.cpp"],
+            sanitize: {
+                misc_undefined: ["integer"],
+            },
         },
         windows: {
             srcs: ["utf8_test.cpp"],