Merge "Only sanitize Android."

am: a22ce825e6 Change-Id: I54991f4989b054cbca8d3326581a6a60392ecfc4
2017-02-15 01:38:18 +00:00 · 2017-02-15 01:38:18 +00:00 · 98536b07fc
commit 98536b07fc
parent bbb4fa78a6 a22ce825e6
1 changed files with 6 additions and 6 deletions
--- a/base/Android.bp
+++ b/base/Android.bp
@ -37,9 +37,6 @@ cc_library {
    cppflags: libbase_cppflags,
    export_include_dirs: ["include"],
    shared_libs: ["liblog"],
-    sanitize: {
-        misc_undefined: ["integer"],
-    },
    target: {
        android: {
            srcs: [
@ -47,6 +44,9 @@ cc_library {
                "properties.cpp",
            ],
            cppflags: ["-Wexit-time-destructors"],
+            sanitize: {
+                misc_undefined: ["integer"],
+            },
        },
        darwin: {
            srcs: ["errors_unix.cpp"],
@ -89,12 +89,12 @@ cc_test {
        "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"],