commit 3aa544f8f07a3ee1985bf133873c0b73a0930fc6
author Dan Albert <danalbert@google.com> Fri Aug 14 21:28:56 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Aug 14 21:28:56 2015 +0000
tree ab5d28c69785576c699d61b04538ade1165e47f8
parent fd373a3615a66b32571fa62f271721d678b37f03
parent e5c18d038ae1f696f278940f0eb2ec0a5436a75b

am e5c18d03: Fix pessimizing move.

* commit 'e5c18d038ae1f696f278940f0eb2ec0a5436a75b':
  Fix pessimizing move.

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)