commit dff8c727c15cbe795e518e9116dfa271e67755b5
author Paul Crowley <paulcrowley@google.com> Mon May 16 08:14:56 2016 -0700
committer Paul Crowley <paulcrowley@google.com> Mon Aug 15 13:58:37 2016 -0700
tree 50950fff728da2c96cb814b08a98c7d7c53d3402
parent 0fe14bdd1cc2f692ecb5b5471d339a41d9add4c5

Support Keymaster 2 configuration and key upgrading

Bug: 27212248
Change-Id: I96bd9a442f4f535ba6ea44c9e81bcc1fee0ec471

Android.mk

diff --git a/Android.mk b/Android.mk
index 4cd3dd0..1c85809 100644
--- a/Android.mk
+++ b/Android.mk
@@ -38,8 +38,6 @@
 	external/scrypt/lib/crypto \
 	frameworks/native/include \
 	system/security/keystore \
-	hardware/libhardware/include/hardware \
-	system/security/softkeymaster/include/keymaster
 
 common_shared_libraries := \
 	libsysutils \
@@ -58,6 +56,7 @@
 	libhardware \
 	libsoftkeymaster \
 	libbase \
+	libsoftkeymasterdevice \
 	libkeymaster_messages \
 
 common_static_libraries := \