commit cf9f5ea7b6bf13f6bb80153084a22b8dc3321aa4
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Apr 13 20:39:59 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Apr 13 20:39:59 2017 +0000
tree 465fadad354c8a9e2e9a80c0101a2beb9d3fa161
parent 5e67c51367f8f605def893ce41ad9928e4650864
parent 07aebe73053df12c21c7481a93146bd76add7fbd

Merge "Superencrypt authentication-bound keys."

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