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

* commit '64c30a79def4dc29749a86c00a970243a2a45f1e':
  init: add LOCAL_SANITIZE := integer
This commit is contained in:
Nick Kralevich 2015-08-17 01:15:17 +00:00 committed by Android Git Automerger
commit d717f86a3e

View file

@ -53,6 +53,7 @@ LOCAL_SRC_FILES:= \
LOCAL_STATIC_LIBRARIES := libbase LOCAL_STATIC_LIBRARIES := libbase
LOCAL_MODULE := libinit LOCAL_MODULE := libinit
LOCAL_SANITIZE := integer
LOCAL_CLANG := true LOCAL_CLANG := true
include $(BUILD_STATIC_LIBRARY) include $(BUILD_STATIC_LIBRARY)
@ -102,6 +103,7 @@ LOCAL_POST_INSTALL_CMD := $(hide) mkdir -p $(TARGET_ROOT_OUT)/sbin; \
ln -sf ../init $(TARGET_ROOT_OUT)/sbin/ueventd; \ ln -sf ../init $(TARGET_ROOT_OUT)/sbin/ueventd; \
ln -sf ../init $(TARGET_ROOT_OUT)/sbin/watchdogd ln -sf ../init $(TARGET_ROOT_OUT)/sbin/watchdogd
LOCAL_SANITIZE := integer
LOCAL_CLANG := true LOCAL_CLANG := true
include $(BUILD_EXECUTABLE) include $(BUILD_EXECUTABLE)
@ -119,5 +121,6 @@ LOCAL_SHARED_LIBRARIES += \
libbase \ libbase \
LOCAL_STATIC_LIBRARIES := libinit LOCAL_STATIC_LIBRARIES := libinit
LOCAL_SANITIZE := integer
LOCAL_CLANG := true LOCAL_CLANG := true
include $(BUILD_NATIVE_TEST) include $(BUILD_NATIVE_TEST)