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

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

Change-Id: Ieec6e56f375740d67df088d8ad8f4585127e8077
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Eran Messeri 2023-01-31 19:12:51 +00:00 committed by Automerger Merge Worker
commit a3a3e2fc82

View file

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