Merge "Only sanitize Android."

am: a22ce825e6

Change-Id: I54991f4989b054cbca8d3326581a6a60392ecfc4
This commit is contained in:
Elliott Hughes 2017-02-15 01:38:18 +00:00 committed by android-build-merger
commit 98536b07fc

View file

@ -37,9 +37,6 @@ cc_library {
cppflags: libbase_cppflags, cppflags: libbase_cppflags,
export_include_dirs: ["include"], export_include_dirs: ["include"],
shared_libs: ["liblog"], shared_libs: ["liblog"],
sanitize: {
misc_undefined: ["integer"],
},
target: { target: {
android: { android: {
srcs: [ srcs: [
@ -47,6 +44,9 @@ cc_library {
"properties.cpp", "properties.cpp",
], ],
cppflags: ["-Wexit-time-destructors"], cppflags: ["-Wexit-time-destructors"],
sanitize: {
misc_undefined: ["integer"],
},
}, },
darwin: { darwin: {
srcs: ["errors_unix.cpp"], srcs: ["errors_unix.cpp"],
@ -89,12 +89,12 @@ cc_test {
"strings_test.cpp", "strings_test.cpp",
"test_main.cpp", "test_main.cpp",
], ],
sanitize: {
misc_undefined: ["integer"],
},
target: { target: {
android: { android: {
srcs: ["properties_test.cpp"], srcs: ["properties_test.cpp"],
sanitize: {
misc_undefined: ["integer"],
},
}, },
windows: { windows: {
srcs: ["utf8_test.cpp"], srcs: ["utf8_test.cpp"],