commit d7f0a73f8d2e9f6b7c08f611944a18c820ddc0cb
author Nick Kralevich <nnk@google.com> Mon Aug 17 01:15:05 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Aug 17 01:15:05 2015 +0000
tree 4d05621b6ec395abc22d833c7f2c39f81b0adee6
parent 065cc3087b034930d989a62cb529f43cebbc1655
parent 64c30a79def4dc29749a86c00a970243a2a45f1e

am 64c30a79: am 084c00b8: Merge "init: add LOCAL_SANITIZE := integer"

* commit '64c30a79def4dc29749a86c00a970243a2a45f1e':
  init: add LOCAL_SANITIZE := integer

init/Android.mk

diff --git a/init/Android.mk b/init/Android.mk
index e9bab63..ff273bb 100644
--- a/init/Android.mk
+++ b/init/Android.mk
@@ -53,6 +53,7 @@
 
 LOCAL_STATIC_LIBRARIES := libbase
 LOCAL_MODULE := libinit
+LOCAL_SANITIZE := integer
 LOCAL_CLANG := true
 include $(BUILD_STATIC_LIBRARY)
 
@@ -102,6 +103,7 @@
     ln -sf ../init $(TARGET_ROOT_OUT)/sbin/ueventd; \
     ln -sf ../init $(TARGET_ROOT_OUT)/sbin/watchdogd
 
+LOCAL_SANITIZE := integer
 LOCAL_CLANG := true
 include $(BUILD_EXECUTABLE)
 
@@ -119,5 +121,6 @@
     libbase \
 
 LOCAL_STATIC_LIBRARIES := libinit
+LOCAL_SANITIZE := integer
 LOCAL_CLANG := true
 include $(BUILD_NATIVE_TEST)