commit 72f06b05af12f37e99e979646281addd16b11c7c
author Nick Kralevich <nnk@google.com> Wed Aug 12 19:22:11 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Aug 12 19:22:11 2015 +0000
tree d5dc08aded5bf16f827d2e533402b14a9278b0d0
parent 46bd64d218e639f06b7b0f4fd4fc6afad32015eb
parent 0dd59f78e0367a682974068d67ad89f491d2807d

am 4d74f2cb: am 0b973da5: Merge "init: add LOCAL_SANITIZE := integer"

* commit '4d74f2cb4c30aaf4dfd176b2f970dbf54e5c697d':
  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)