summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Gampe2018-01-04 21:21:18 -0600
committerAndreas Gampe2018-01-04 21:25:52 -0600
commite4c9acb767d8be9835b22f15ae37c0ef4f0098b3 (patch)
tree1d2441cb0e2ded709f446fc2e3d907298f8c0fe2
parentdb976aa52682ce379f7f64f872502216391e800b (diff)
downloadplatform-system-core-e4c9acb767d8be9835b22f15ae37c0ef4f0098b3.tar.gz
platform-system-core-e4c9acb767d8be9835b22f15ae37c0ef4f0098b3.tar.xz
platform-system-core-e4c9acb767d8be9835b22f15ae37c0ef4f0098b3.zip
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
-rw-r--r--property_service/libpropertyinfoparser/Android.bp8
-rw-r--r--property_service/libpropertyinfoserializer/Android.bp8
-rw-r--r--property_service/property_info_checker/Android.bp10
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 {
4 srcs: ["property_info_parser.cpp"], 4 srcs: ["property_info_parser.cpp"],
5 5
6 cpp_std: "experimental", 6 cpp_std: "experimental",
7 sanitize: { 7 target: {
8 misc_undefined: ["signed-integer-overflow"], 8 linux: {
9 sanitize: {
10 misc_undefined: ["signed-integer-overflow"],
11 },
12 },
9 }, 13 },
10 cppflags: [ 14 cppflags: [
11 "-Wall", 15 "-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 {
2 name: "propertyinfoserializer_defaults", 2 name: "propertyinfoserializer_defaults",
3 host_supported: true, 3 host_supported: true,
4 cpp_std: "experimental", 4 cpp_std: "experimental",
5 sanitize: { 5 target: {
6 misc_undefined: ["signed-integer-overflow"], 6 linux: {
7 sanitize: {
8 misc_undefined: ["signed-integer-overflow"],
9 },
10 },
7 }, 11 },
8 cppflags: [ 12 cppflags: [
9 "-Wall", 13 "-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 {
2 name: "property_info_checker", 2 name: "property_info_checker",
3 host_supported: true, 3 host_supported: true,
4 cpp_std: "experimental", 4 cpp_std: "experimental",
5 sanitize: { 5 target: {
6 misc_undefined: ["signed-integer-overflow"], 6 linux: {
7 sanitize: {
8 misc_undefined: ["signed-integer-overflow"],
9 },
10 },
7 }, 11 },
8 static_libs: [ 12 static_libs: [
9 "libpropertyinfoserializer", 13 "libpropertyinfoserializer",
@@ -11,4 +15,4 @@ cc_binary {
11 "libbase", 15 "libbase",
12 ], 16 ],
13 srcs: ["property_info_checker.cpp"], 17 srcs: ["property_info_checker.cpp"],
14} \ No newline at end of file 18}