Merge TQ2A.230305.008
Bug: 264720040
Merged-In: I359adccf70ad468459f17c9990debf85e7834d99
Change-Id: Ieacc56765741d7680fb7048f34be461e414dd6f6
diff --git a/aosp_oriole.mk b/aosp_oriole.mk
index fea2be8..113f679 100644
--- a/aosp_oriole.mk
+++ b/aosp_oriole.mk
@@ -22,3 +22,5 @@
PRODUCT_MODEL := AOSP on Oriole
PRODUCT_BRAND := Android
PRODUCT_MANUFACTURER := Google
+
+PRODUCT_PACKAGES += com.android.vndk.current.on_vendor
diff --git a/aosp_raven.mk b/aosp_raven.mk
index 0a8f525..6a29283 100644
--- a/aosp_raven.mk
+++ b/aosp_raven.mk
@@ -18,7 +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
diff --git a/device-oriole.mk b/device-oriole.mk
index cfca19a..4f93444 100644
--- a/device-oriole.mk
+++ b/device-oriole.mk
@@ -227,6 +227,11 @@
PRODUCT_PRODUCT_PROPERTIES += \
vendor.audio.hapticgenerator.distortion.output.gain=0.5
+# RKPD
+PRODUCT_PRODUCT_PROPERTIES += \
+ remote_provisioning.enable_rkpd=true \
+ remote_provisioning.hostname=remoteprovisioning.googleapis.com \
+
# Set zram size
PRODUCT_VENDOR_PROPERTIES += \
vendor.zram.size=3g
diff --git a/device-raven.mk b/device-raven.mk
index 9969ef3..2673bd3 100644
--- a/device-raven.mk
+++ b/device-raven.mk
@@ -240,6 +240,11 @@
PRODUCT_PRODUCT_PROPERTIES += \
vendor.audio.hapticgenerator.distortion.output.gain=0.5
+# RKPD
+PRODUCT_PRODUCT_PROPERTIES += \
+ remote_provisioning.enable_rkpd=true \
+ remote_provisioning.hostname=remoteprovisioning.googleapis.com \
+
# Set zram size
PRODUCT_VENDOR_PROPERTIES += \
vendor.zram.size=3g