commit 45288223d0ce864b84aa2d3e0321c0276c136ae1
author Elliott Hughes <enh@google.com> Thu Aug 13 21:10:37 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Aug 13 21:10:37 2015 +0000
tree 6ecaeca20d086335e5ee5360d118a47a76882209
parent 1efef4c49d59446d3c589563a040b0fbbd8ed73a
parent bdab59a8613c732df5d746328ff2268be8da13ab

Merge "libbase: logging fixes"

init/Android.mk

diff --git a/init/Android.mk b/init/Android.mk
index 58bff58..6737be4 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)
 
@@ -101,7 +100,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)
 
@@ -119,6 +117,5 @@
     libbase \
 
 LOCAL_STATIC_LIBRARIES := libinit
-LOCAL_SANITIZE := integer
 LOCAL_CLANG := true
 include $(BUILD_NATIVE_TEST)