commit 7f8ccb5caf21441830f16986123dac7d9c4979c7
author David Zeuthen <zeuthen@google.com> Wed Mar 10 14:40:17 2021 -0500
committer David Zeuthen <zeuthen@google.com> Thu Mar 25 08:07:03 2021 -0400
tree 087d6a465c4d09d3ab662cf678dd829f18089e2c
parent 4c912d90427c7a3a3f84c6259f4f86b5c903f7af

KeyMint + KeyMaster: Include permissions for FEATURE_HARDWARE_KEYSTORE.

This change includes permission files for the new permission
FEATURE_HARDWARE_KEYSTORE for the default KeyMaster and KeyMint
implementations.

Test: Manually inspected that permission files are installed.
Test: atest android.keystore.cts.KeyAttestationTest#testAttestationKmVersionMatchesFeatureVersion
Bug: 160616951
Change-Id: Ia35e1ba6c894624999eed62e8434a20ebc833b97

keymaster/4.1/default/Android.bp

diff --git a/keymaster/4.1/default/Android.bp b/keymaster/4.1/default/Android.bp
index 3e2289a..6ec1fae 100644
--- a/keymaster/4.1/default/Android.bp
+++ b/keymaster/4.1/default/Android.bp
@@ -45,5 +45,14 @@
         "liblog",
         "libutils",
     ],
+    required: [
+        "android.hardware.hardware_keystore.km41.xml",
+    ],
+}
 
+prebuilt_etc {
+    name: "android.hardware.hardware_keystore.km41.xml",
+    sub_dir: "permissions",
+    vendor: true,
+    src: "android.hardware.hardware_keystore.km41.xml",
 }