commit b98be4d6fa54247c655fdbf4aed49ca1b43a6f48
author Nick Kralevich <nnk@google.com> Thu Aug 13 18:27:36 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Aug 13 18:27:36 2015 +0000
tree c2c0b7da27cefb38e93b4efa7d711c300bbf13d8
parent b7230f73e37ec55479cd37d1e14b71e7fe5cc1a3
parent 4e7f2b85b0a130e6d9f467bd90bc9f6bf0e5672f

am 51ffedd2: am 1efef4c4: Merge "Revert "init: add LOCAL_SANITIZE := integer""

* commit '51ffedd264389730a76470408a122589f7ce3488':
  Revert "init: add LOCAL_SANITIZE := integer"

init/Android.mk

diff --git a/init/Android.mk b/init/Android.mk
index ff273bb..e9bab63 100644
--- a/init/Android.mk
+++ b/init/Android.mk
@@ -53,7 +53,6 @@
 
 LOCAL_STATIC_LIBRARIES := libbase
 LOCAL_MODULE := libinit
-LOCAL_SANITIZE := integer
 LOCAL_CLANG := true
 include $(BUILD_STATIC_LIBRARY)
 
@@ -103,7 +102,6 @@
     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)
 
@@ -121,6 +119,5 @@
     libbase \
 
 LOCAL_STATIC_LIBRARIES := libinit
-LOCAL_SANITIZE := integer
 LOCAL_CLANG := true
 include $(BUILD_NATIVE_TEST)