From e4c9acb767d8be9835b22f15ae37c0ef4f0098b3 Mon Sep 17 00:00:00 2001 From: Andreas Gampe Date: Thu, 4 Jan 2018 19:21:18 -0800 Subject: [PATCH] PropertyService: Exclude sanitization for darwin This doesn't seem to work. All other projects restrict sanitization, too. Mac build not actually tested. Test: m Test: linux host build still contains ubsan symbols Change-Id: I60532a46177632320ba3b15b4a7c2d5e31ef2bfc --- property_service/libpropertyinfoparser/Android.bp | 8 ++++++-- property_service/libpropertyinfoserializer/Android.bp | 8 ++++++-- property_service/property_info_checker/Android.bp | 10 +++++++--- 3 files changed, 19 insertions(+), 7 deletions(-) diff --git a/property_service/libpropertyinfoparser/Android.bp b/property_service/libpropertyinfoparser/Android.bp index c046417dc..ffaa2b304 100644 --- a/property_service/libpropertyinfoparser/Android.bp +++ b/property_service/libpropertyinfoparser/Android.bp @@ -4,8 +4,12 @@ cc_library_static { srcs: ["property_info_parser.cpp"], cpp_std: "experimental", - sanitize: { - misc_undefined: ["signed-integer-overflow"], + target: { + linux: { + sanitize: { + misc_undefined: ["signed-integer-overflow"], + }, + }, }, cppflags: [ "-Wall", diff --git a/property_service/libpropertyinfoserializer/Android.bp b/property_service/libpropertyinfoserializer/Android.bp index bc28e8276..0a1593b26 100644 --- a/property_service/libpropertyinfoserializer/Android.bp +++ b/property_service/libpropertyinfoserializer/Android.bp @@ -2,8 +2,12 @@ cc_defaults { name: "propertyinfoserializer_defaults", host_supported: true, cpp_std: "experimental", - sanitize: { - misc_undefined: ["signed-integer-overflow"], + target: { + linux: { + sanitize: { + misc_undefined: ["signed-integer-overflow"], + }, + }, }, cppflags: [ "-Wall", diff --git a/property_service/property_info_checker/Android.bp b/property_service/property_info_checker/Android.bp index 2c9a2ba2a..78659d40d 100644 --- a/property_service/property_info_checker/Android.bp +++ b/property_service/property_info_checker/Android.bp @@ -2,8 +2,12 @@ cc_binary { name: "property_info_checker", host_supported: true, cpp_std: "experimental", - sanitize: { - misc_undefined: ["signed-integer-overflow"], + target: { + linux: { + sanitize: { + misc_undefined: ["signed-integer-overflow"], + }, + }, }, static_libs: [ "libpropertyinfoserializer", @@ -11,4 +15,4 @@ cc_binary { "libbase", ], srcs: ["property_info_checker.cpp"], -} \ No newline at end of file +}