commit 1966a9a99de8fa2152338114d0eadbacbe6c00e8
author Nick Kralevich <nnk@google.com> Wed Aug 26 18:41:11 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Aug 26 18:41:11 2015 +0000
tree 60494846f6e9d74abb9c0d38de7aeb50006bf06f
parent 66bd37f6a7ac99bcfccb7346fa0795e6e0578086
parent 30a4acd16480c7b533431ae6b029437d3fe7e77d

am 53f11b62: Merge "libcutils: enable LOCAL_SANITIZE := integer"

* commit '53f11b620d2be294d3f04acd801e6a5c2f2f4a69':
  libcutils: enable LOCAL_SANITIZE := integer

libcutils/Android.mk

diff --git a/libcutils/Android.mk b/libcutils/Android.mk
index 5330949..f9060c4 100644
--- a/libcutils/Android.mk
+++ b/libcutils/Android.mk
@@ -123,6 +123,8 @@
 LOCAL_C_INCLUDES := $(libcutils_c_includes)
 LOCAL_STATIC_LIBRARIES := liblog
 LOCAL_CFLAGS += -Werror -Wall -Wextra -std=gnu90
+LOCAL_CLANG := true
+LOCAL_SANITIZE := integer
 include $(BUILD_STATIC_LIBRARY)
 
 include $(CLEAR_VARS)
@@ -133,6 +135,8 @@
 LOCAL_SHARED_LIBRARIES := liblog
 LOCAL_CFLAGS += -Werror -Wall -Wextra
 LOCAL_C_INCLUDES := $(libcutils_c_includes)
+LOCAL_CLANG := true
+LOCAL_SANITIZE := integer
 include $(BUILD_SHARED_LIBRARY)
 
 include $(call all-makefiles-under,$(LOCAL_PATH))