commit 16d04f35c5e4d74bf8d99466de0e2c87431b4b94
author Shawn Willden <swillden@google.com> Fri Aug 14 03:28:36 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Aug 14 03:28:36 2015 +0000
tree 6b7815d5b519f416ad9b7830af608726c9057984
parent 8991d029afc7a97c45ce4eaae8fd6ada2462dc62
parent a481160fa6b335850cbda8e9903de4972ad8541b

am a481160f: am c2120744: Merge "Wrap incomplete keymaster1 implementations with sw keymaster." into mnc-dr-dev

* commit 'a481160fa6b335850cbda8e9903de4972ad8541b':
  Wrap incomplete keymaster1 implementations with sw keymaster.

keystore/Android.mk

diff --git a/keystore/Android.mk b/keystore/Android.mk
index e18b2d8..2314122 100644
--- a/keystore/Android.mk
+++ b/keystore/Android.mk
@@ -38,6 +38,8 @@
 LOCAL_MODULE := keystore
 LOCAL_MODULE_TAGS := optional
 LOCAL_C_INCLUES := system/keymaster/
+LOCAL_CLANG := true
+LOCAL_SANITIZE := integer
 LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
 include $(BUILD_EXECUTABLE)
 
@@ -65,6 +67,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)