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

Commit 7d9cda18 authored by Prashant Patil's avatar Prashant Patil
Browse files

AOSP: Added new properties for attestation 

Added new properties, which could be set for AOSP/GSI builds.
These properties are going to be used for attestation feature through
Build.java class. Earlier in AOSP builds attestation ids were different
from provisioned ids in Keymint. These properties will be identical to
provisioned ids.

Bug: 110779648
Bug: 259376922
Test: atest VtsAidlKeyMintTargetTest:PerInstance/NewKeyGenerationTest#EcdsaAttestationIdTags/0_android_hardware_security_keymint_IKeyMintDevice_default
Test: atest VtsAidlKeyMintTargetTest:PerInstance/NewKeyGenerationTest#EcdsaAttestationIdTags/1_android_hardware_security_keymint_IKeyMintDevice_strongbox
Test: atest CtsKeystoreTestCases:android.keystore.cts.KeyAttestationTest CtsKeystoreTestCases:DeviceOwnerKeyManagementTest

Change-Id: I9eea5e0f2fabc667b3efedeeefdf12e7b4fc9502
parent af79d1de

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)),\