commit 33377ba3969c83ca7db1e7313d9743487b95e063
author Nick Kralevich <nnk@google.com> Wed Jun 17 00:20:01 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Jun 17 00:20:01 2015 +0000
tree 46b4aab6f3c04f3b20423ee2321ac5263c887ed1
parent 721c6b0b853277fb3d33863d2e8a81a23a173ce8
parent 99f3776296f405ffff8b2bbf2906ef8a68de7675

am 2f2e6cd0: am 4c6269ce: am 106f92f5: Merge "Revert "init: Enable LOCAL_DETECT_INTEGER_OVERFLOWS""

* commit '2f2e6cd07831a37ca3bef7d78bedb5c8f1c52e24':
  Revert "init: Enable LOCAL_DETECT_INTEGER_OVERFLOWS"

init/Android.mk

diff --git a/init/Android.mk b/init/Android.mk
index 91d222a..6ef8dff 100644
--- a/init/Android.mk
+++ b/init/Android.mk
@@ -30,8 +30,6 @@
 
 LOCAL_STATIC_LIBRARIES := libbase
 LOCAL_MODULE := libinit
-
-LOCAL_DETECT_INTEGER_OVERFLOWS := true
 LOCAL_CLANG := true
 include $(BUILD_STATIC_LIBRARY)
 
@@ -81,7 +79,6 @@
     ln -sf ../init $(TARGET_ROOT_OUT)/sbin/ueventd; \
     ln -sf ../init $(TARGET_ROOT_OUT)/sbin/watchdogd
 
-LOCAL_DETECT_INTEGER_OVERFLOWS := true
 LOCAL_CLANG := true
 include $(BUILD_EXECUTABLE)
 
@@ -99,6 +96,5 @@
     libbase \
 
 LOCAL_STATIC_LIBRARIES := libinit
-LOCAL_DETECT_INTEGER_OVERFLOWS := true
 LOCAL_CLANG := true
 include $(BUILD_NATIVE_TEST)