commit 027abb08bd6e18825c71a28f52cd0a0491ddcdb0
author Tom Cherry <tomcherry@google.com> Thu Jul 27 00:58:03 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Jul 27 00:58:03 2017 +0000
tree c84cd1caaff466afb52ae17f4ea4d77b31cfe021
parent 2b160c5834b993a10ee7cb3a1858e9d1098f4e02
parent ff69bbf32e873021eaca1d14b097284866b8a6f1

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

Change-Id: Ic0da94313de22222d4312cf097fd5dcd43c76344

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 ad17f79..f30c2a4 100644
--- a/init/Android.mk
+++ b/init/Android.mk
@@ -99,5 +99,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)