commit ead11aa0e1ba0c0c877b3ab80623ea8bcbaac79a
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Apr 13 21:25:57 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Apr 13 21:25:57 2017 +0000
tree 0622d3f63fcb84f7bbfb07d5f00e2a5f4d86ad94
parent ecb258e775f3bab5783dfd49c9aa87f607f7c5b1
parent e2a7b528499257cbec27abb20371b760f2972812

Merge "Fix unique ID attestation." into oc-dev

keystore-engine/Android.mk

diff --git a/keystore-engine/Android.mk b/keystore-engine/Android.mk
index 3041aa3..8988857 100644
--- a/keystore-engine/Android.mk
+++ b/keystore-engine/Android.mk
@@ -61,5 +61,6 @@
 	libutils
 
 LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
+LOCAL_VENDOR_MODULE := true
 
 include $(BUILD_SHARED_LIBRARY)

keystore/Android.mk

diff --git a/keystore/Android.mk b/keystore/Android.mk
index 5d84565..8231bf1 100644
--- a/keystore/Android.mk
+++ b/keystore/Android.mk
@@ -168,6 +168,7 @@
 LOCAL_CLANG := true
 LOCAL_SANITIZE := integer
 LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
+LOCAL_VENDOR_MODULE := true
 include $(BUILD_SHARED_LIBRARY)
 
 # Library for unit tests