commit 162df568bb8ece581867ded055fe7f89d45afc1e
author Tom Cherry <tomcherry@google.com> Fri Aug 21 18:31:54 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Aug 21 18:31:54 2015 +0000
tree 1db6e22155e384ecf11081dff740ba25c55c62f3
parent ce8cfc816dac00524176454fdbdb8c3be6664ed7
parent 26be6a17cdfaa94dcb33a04af085aedfa527e833

am 26be6a17: am aae1bbf4: Merge "bundle init.rc contents with its service"

* commit '26be6a17cdfaa94dcb33a04af085aedfa527e833':
  bundle init.rc contents with its service

keystore/Android.mk

diff --git a/keystore/Android.mk b/keystore/Android.mk
index 3babd1d..78a2af4 100644
--- a/keystore/Android.mk
+++ b/keystore/Android.mk
@@ -39,6 +39,8 @@
 LOCAL_MODULE_TAGS := optional
 LOCAL_INIT_RC := keystore.rc
 LOCAL_C_INCLUES := system/keymaster/
+LOCAL_CLANG := true
+LOCAL_SANITIZE := integer
 LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
 include $(BUILD_EXECUTABLE)
 
@@ -66,6 +68,8 @@
 LOCAL_MODULE_TAGS := optional
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/include
 LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include
+LOCAL_CLANG := true
+LOCAL_SANITIZE := integer
 LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
 include $(BUILD_SHARED_LIBRARY)