commit fa91bf2fadfb1cd044736d4c646ca37466503554
author Treehugger Robot <treehugger-gerrit@google.com> Tue Nov 17 16:13:50 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Nov 17 16:13:50 2020 +0000
tree c8442b219da6ca0b2653ff87a2d5307b67762e00
parent 82a58294cc2f305a9287b0471f542e863544aafa
parent 1d015a5d35bac2dbd08e5483758805810a3ed0ce

Merge "Make related stuff for Keymint V1."

target/product/cfi-common.mk

diff --git a/target/product/cfi-common.mk b/target/product/cfi-common.mk
index 42edd92..6d81a87 100644
--- a/target/product/cfi-common.mk
+++ b/target/product/cfi-common.mk
@@ -28,7 +28,8 @@
     hardware/broadcom/wlan/bcmdhd/wpa_supplicant_8_lib \
     hardware/interfaces/nfc \
     hardware/qcom/wlan/qcwcn/wpa_supplicant_8_lib \
-    harware/interfaces/keymaster \
+    hardware/interfaces/keymaster \
+    hardware/interfaces/keymint \
     system/bt \
     system/chre \
     system/core/libnetutils \

target/product/gsi/current.txt

diff --git a/target/product/gsi/current.txt b/target/product/gsi/current.txt
index c17398b..9c08e5e 100644
--- a/target/product/gsi/current.txt
+++ b/target/product/gsi/current.txt
@@ -69,6 +69,7 @@
 VNDK-core: android.hardware.graphics.bufferqueue@2.0.so
 VNDK-core: android.hardware.identity-V2-ndk_platform.so
 VNDK-core: android.hardware.keymaster-V2-ndk_platform.so
+VNDK-core: android.hardware.keymint-V1-ndk_platform.so
 VNDK-core: android.hardware.light-V1-ndk_platform.so
 VNDK-core: android.hardware.media.bufferpool@2.0.so
 VNDK-core: android.hardware.media.omx@1.0.so