commit d3fac68c4982a5a188c0b3648eea2f16c4791d21
author Shawn Willden <swillden@google.com> Tue Jan 26 13:50:17 2016 -0700
committer Shawn Willden <swillden@google.com> Wed Jan 27 20:26:18 2016 -0700
tree fcf3d25ebd157f2c4b1ba6be2e81270a9a8a763f
parent 50eb1b2f89ca455b2e9caa635bfe0b5ed94b416a

Add KM_TAG_ALLOW_WHILE_ON_BODY

Actually, this change eliminates the need to update keystore_cli_v2
every time a tag is added, which also has the effect of supporting
KM_TAG_ALLOW_WHILE_ON_BODY.

Change-Id: I15dd4ec4b7cab52dba43ec5d0afc6f8caf922389

keystore/Android.mk

diff --git a/keystore/Android.mk b/keystore/Android.mk
index f2262c1..04ca220 100644
--- a/keystore/Android.mk
+++ b/keystore/Android.mk
@@ -74,7 +74,7 @@
 ifeq ($(USE_32_BIT_KEYSTORE), true)
 LOCAL_MULTILIB := 32
 endif
-LOCAL_CFLAGS := -Wall -Wextra -Werror -Wno-unused-parameter
+LOCAL_CFLAGS := -Wall -Wextra -Werror -Wno-unused-parameter -DKEYMASTER_NAME_TAGS
 LOCAL_SRC_FILES := keystore_cli_v2.cpp
 LOCAL_SHARED_LIBRARIES := \
 	libchrome \