Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6d2a5f43 authored by Eran Messeri's avatar Eran Messeri Committed by Automerger Merge Worker
Browse files

Merge "AOSP: Added new properties for attestation" am: 1f5aa114 

Original change: https://android-review.googlesource.com/c/platform/build/+/2237054



Change-Id: Ie43c9b857d3456992d16956369c00ef7a88b9850
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a6cc8eac 1f5aa114

core/product.mk

+3 −0
Original line number Diff line number Diff line
@@ -24,6 +24,8 @@ _product_list_vars := 


_product_single_value_vars += PRODUCT_NAME

_product_single_value_vars += PRODUCT_MODEL

_product_single_value_vars += PRODUCT_NAME_FOR_ATTESTATION

_product_single_value_vars += PRODUCT_MODEL_FOR_ATTESTATION



# The resoure configuration options to use for this product.

_product_list_vars += PRODUCT_LOCALES
@@ -43,6 +45,7 @@ _product_list_vars += PRODUCT_PACKAGES_TESTS 
_product_single_value_vars += PRODUCT_DEVICE

_product_single_value_vars += PRODUCT_MANUFACTURER

_product_single_value_vars += PRODUCT_BRAND

_product_single_value_vars += PRODUCT_BRAND_FOR_ATTESTATION



# These PRODUCT_SYSTEM_* flags, if defined, are used in place of the

# corresponding PRODUCT_* flags for the sysprops on /system.

core/sysprop.mk

+4 −0
Original line number Diff line number Diff line
@@ -46,6 +46,10 @@ define generate-common-build-props 
        echo "ro.product.$(1).manufacturer=$(PRODUCT_MANUFACTURER)" >> $(2);\

        echo "ro.product.$(1).model=$(PRODUCT_MODEL)" >> $(2);\

        echo "ro.product.$(1).name=$(TARGET_PRODUCT)" >> $(2);\

        # Attestation specific properties for AOSP/GSI build running on device.

        echo "ro.product.model_for_attestation=$(PRODUCT_MODEL_FOR_ATTESTATION)" >> $(2);\

        echo "ro.product.brand_for_attestation=$(PRODUCT_BRAND_FOR_ATTESTATION)" >> $(2);\

        echo "ro.product.name_for_attestation=$(PRODUCT_NAME_FOR_ATTESTATION)" >> $(2);\

    )\

    $(if $(filter true,$(ZYGOTE_FORCE_64)),\

        $(if $(filter vendor,$(1)),\