commit 01d62bf347a13bf48aca2e6672a0429da15a6899
author Tom Cherry <tomcherry@google.com> Fri Jan 05 17:38:15 2018 +0000
committer android-build-merger <android-build-merger@google.com> Fri Jan 05 17:38:15 2018 +0000
tree 3c9d253169725e4bf3afa50aafb1e081d6284188
parent 8518daecd0266d05c51b5b5e1359a9b180a011e1
parent 040b849f5a7d9dfb24e99c333fb07e539c7fb55f

Merge "PropertyService: Exclude sanitization for darwin" am: 5a7a8f2f17
am: 040b849f5a

Change-Id: Idc017ee189d9ebe5acdb59c9fb379b46f8dfa1f1

property_service/libpropertyinfoparser/Android.bp

diff --git a/property_service/libpropertyinfoparser/Android.bp b/property_service/libpropertyinfoparser/Android.bp
index c046417..ffaa2b3 100644
--- a/property_service/libpropertyinfoparser/Android.bp
+++ b/property_service/libpropertyinfoparser/Android.bp
@@ -4,8 +4,12 @@
     srcs: ["property_info_parser.cpp"],
 
     cpp_std: "experimental",
-    sanitize: {
-        misc_undefined: ["signed-integer-overflow"],
+    target: {
+        linux: {
+            sanitize: {
+                misc_undefined: ["signed-integer-overflow"],
+            },
+        },
     },
     cppflags: [
         "-Wall",

property_service/libpropertyinfoserializer/Android.bp

diff --git a/property_service/libpropertyinfoserializer/Android.bp b/property_service/libpropertyinfoserializer/Android.bp
index bc28e82..0a1593b 100644
--- a/property_service/libpropertyinfoserializer/Android.bp
+++ b/property_service/libpropertyinfoserializer/Android.bp
@@ -2,8 +2,12 @@
     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",

property_service/property_info_checker/Android.bp

diff --git a/property_service/property_info_checker/Android.bp b/property_service/property_info_checker/Android.bp
index 2c9a2ba..78659d4 100644
--- a/property_service/property_info_checker/Android.bp
+++ b/property_service/property_info_checker/Android.bp
@@ -2,8 +2,12 @@
     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 @@
         "libbase",
     ],
     srcs: ["property_info_checker.cpp"],
-}
\ No newline at end of file
+}