From 548aa0c03048170e7f75f7f7eaa041aa4d1384c0 Mon Sep 17 00:00:00 2001
From: Tommy Chiu <tommychiu@google.com>
Date: Mon, 7 Mar 2022 21:07:12 +0800
Subject: [PATCH] KM: Add Device ID attestation support

Reference: ag/14623068

Bug: 222635310
Test:
android.keystore.cts.KeyAttestationTest#testMandatoryDeviceidAttestation

Change-Id: I4acfaf0d82e5805c84b36d0750d7e013de8a83ea
---
 device.mk | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/device.mk b/device.mk
index cb11e69a..7c4f6043 100644
--- a/device.mk
+++ b/device.mk
@@ -1068,3 +1068,8 @@ PRODUCT_PACKAGES_DEBUG += BatteryStatsViewer
 # (TODO: b/169535506) This includes the FCM for system_ext and product partition.
 # It must be split into the FCM of each partition.
 DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE := device/google/gs201/device_framework_matrix_product.xml
+
+# Keymint configuration
+PRODUCT_COPY_FILES += \
+    frameworks/native/data/etc/android.software.device_id_attestation.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.device_id_attestation.xml \
+    frameworks/native/data/etc/android.hardware.device_unique_attestation.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.device_unique_attestation.xml