commit a12e34cc315a0fb4d9ec1df54ddae8c6261d5f09
author Tom Cherry <tomcherry@google.com> Thu Jul 27 01:26:33 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Jul 27 01:26:33 2017 +0000
tree c2ab71188d9424fb9364c3aca715984d140b145d
parent 1324a24b2620aa5d551887828558d759efdf43c7
parent 9d36683fd745a3264d4efce8bae096cae4ecc061

Merge "init: only use signed-integer-overflow sanitizer" am: a19f481c8c am: 2eada2af9c
am: 9d36683fd7

Change-Id: I31be7dc0620e55dea1e97f2f26f59dce028cb563

init/Android.bp

diff --git a/init/Android.bp b/init/Android.bp
index 8294598..aaef7e9 100644
--- a/init/Android.bp
+++ b/init/Android.bp
@@ -18,7 +18,7 @@
     name: "init_defaults",
     cpp_std: "experimental",
     sanitize: {
-        misc_undefined: ["integer"],
+        misc_undefined: ["signed-integer-overflow"],
     },
     cppflags: [
         "-DLOG_UEVENTS=0",

init/Android.mk

diff --git a/init/Android.mk b/init/Android.mk
index 9eb7649..293df2f 100644
--- a/init/Android.mk
+++ b/init/Android.mk
@@ -97,5 +97,5 @@
     ln -sf ../init $(TARGET_ROOT_OUT)/sbin/ueventd; \
     ln -sf ../init $(TARGET_ROOT_OUT)/sbin/watchdogd
 
-LOCAL_SANITIZE := integer
+LOCAL_SANITIZE := signed-integer-overflow
 include $(BUILD_EXECUTABLE)