diff options
| -rw-r--r-- | core/sysprop.mk | 18 | ||||
| -rw-r--r-- | target/product/gsi_release.mk | 3 | ||||
| -rw-r--r-- | target/product/updatable_apex.mk | 2 |
3 files changed, 19 insertions, 4 deletions
diff --git a/core/sysprop.mk b/core/sysprop.mk index bd6f3d9fdf..44af367a38 100644 --- a/core/sysprop.mk +++ b/core/sysprop.mk @@ -47,9 +47,21 @@ define generate-common-build-props 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 [ -n "$(strip $(PRODUCT_MODEL_FOR_ATTESTATION))" ]; then \ + echo "ro.product.model_for_attestation=$(PRODUCT_MODEL_FOR_ATTESTATION)" >> $(2);\ + fi; \ + if [ -n "$(strip $(PRODUCT_BRAND_FOR_ATTESTATION))" ]; then \ + echo "ro.product.brand_for_attestation=$(PRODUCT_BRAND_FOR_ATTESTATION)" >> $(2);\ + fi; \ + if [ -n "$(strip $(PRODUCT_NAME_FOR_ATTESTATION))" ]; then \ + echo "ro.product.name_for_attestation=$(PRODUCT_NAME_FOR_ATTESTATION)" >> $(2);\ + fi; \ + if [ -n "$(strip $(PRODUCT_DEVICE_FOR_ATTESTATION))" ]; then \ + echo "ro.product.device_for_attestation=$(PRODUCT_DEVICE_FOR_ATTESTATION)" >> $(2);\ + fi; \ + if [ -n "$(strip $(PRODUCT_MANUFACTURER_FOR_ATTESTATION))" ]; then \ + echo "ro.product.manufacturer_for_attestation=$(PRODUCT_MANUFACTURER_FOR_ATTESTATION)" >> $(2);\ + fi; \ )\ $(if $(filter true,$(ZYGOTE_FORCE_64)),\ $(if $(filter vendor,$(1)),\ diff --git a/target/product/gsi_release.mk b/target/product/gsi_release.mk index 3b977927d1..9d102ea515 100644 --- a/target/product/gsi_release.mk +++ b/target/product/gsi_release.mk @@ -91,3 +91,6 @@ PRODUCT_EXPORT_BOOT_IMAGE_TO_DIST := true # Additional settings used in all GSI builds PRODUCT_PRODUCT_PROPERTIES += \ ro.crypto.metadata_init_delete_all_keys.enabled=false \ + +# Window Extensions +$(call inherit-product, $(SRC_TARGET_DIR)/product/window_extensions.mk)
\ No newline at end of file diff --git a/target/product/updatable_apex.mk b/target/product/updatable_apex.mk index d606e0037d..c19982b274 100644 --- a/target/product/updatable_apex.mk +++ b/target/product/updatable_apex.mk @@ -20,7 +20,7 @@ ifneq ($(OVERRIDE_TARGET_FLATTEN_APEX),true) # com.android.apex.cts.shim.v1_prebuilt overrides CtsShimPrebuilt # and CtsShimPrivPrebuilt since they are packaged inside the APEX. PRODUCT_PACKAGES += com.android.apex.cts.shim.v1_prebuilt - PRODUCT_VENDOR_PROPERTIES := ro.apex.updatable=true + PRODUCT_SYSTEM_PROPERTIES := ro.apex.updatable=true TARGET_FLATTEN_APEX := false # Use compressed apexes in pre-installed partitions. # Note: this doesn't mean that all pre-installed apexes will be compressed. |