commit dccda772c43fbbcf1ecd428f926264b1af3f45bb
author Eran Messeri <eranm@google.com> Tue Jan 31 16:59:07 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Jan 31 16:59:07 2023 +0000
tree e3fd4800780286115cfbe7dc68051ab9e5d20070
parent aa0f8a6cc6885361193042f8c0905fba5c2a2978
parent f19b0018667ddb813e2885caa9f712227efbcd26

Merge "Keystore: Attestation fix in AOSP builds" am: f19b001866

Original change: https://android-review.googlesource.com/c/device/google/raviole/+/2238893

Change-Id: Iaa85f5fdf6870e780c7f4ce93266407ecb11bd48
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

aosp_raven.mk

diff --git a/aosp_raven.mk b/aosp_raven.mk
index 079de8a..6a29283 100644
--- a/aosp_raven.mk
+++ b/aosp_raven.mk
@@ -18,9 +18,12 @@
 $(call inherit-product, device/google/raviole/device-raven.mk)
 
 PRODUCT_NAME := aosp_raven
+PRODUCT_NAME_FOR_ATTESTATION := raven
 PRODUCT_DEVICE := raven
 PRODUCT_MODEL := AOSP on Raven
+PRODUCT_MODEL_FOR_ATTESTATION := Pixel 6 Pro
 PRODUCT_BRAND := Android
+PRODUCT_BRAND_FOR_ATTESTATION := google
 PRODUCT_MANUFACTURER := Google
 
 PRODUCT_PACKAGES += com.android.vndk.current.on_vendor