diff options
| author | 2021-09-24 03:10:34 +0000 | |
|---|---|---|
| committer | 2021-09-24 03:10:34 +0000 | |
| commit | ad48e9cb875fcb59d9b3675938d2bc7e7033498f (patch) | |
| tree | 1b0e21ec8eff9b737da98156c761c9c08b023331 | |
| parent | 84a87eb9ed6a9e46b78bc37ce44fd8139f0c0f61 (diff) | |
| parent | f63bd5d4bafd863587d91b6904f22a47add872b3 (diff) | |
Merge "Reland: Add PRODUCT_INSTALL_DEBUG_POLICY_TO_SYSTEM_EXT"
| -rw-r--r-- | core/android_soong_config_vars.mk | 1 | ||||
| -rw-r--r-- | core/product.mk | 5 | ||||
| -rw-r--r-- | core/product_config.mk | 6 |
3 files changed, 12 insertions, 0 deletions
diff --git a/core/android_soong_config_vars.mk b/core/android_soong_config_vars.mk index 2197eb968c..4aba87ea59 100644 --- a/core/android_soong_config_vars.mk +++ b/core/android_soong_config_vars.mk @@ -30,6 +30,7 @@ $(call add_soong_config_var,ANDROID,TARGET_ENABLE_MEDIADRM_64) $(call add_soong_config_var,ANDROID,BOARD_USES_ODMIMAGE) $(call add_soong_config_var,ANDROID,BOARD_USES_RECOVERY_AS_BOOT) $(call add_soong_config_var,ANDROID,BOARD_BUILD_SYSTEM_ROOT_IMAGE) +$(call add_soong_config_var,ANDROID,PRODUCT_INSTALL_DEBUG_POLICY_TO_SYSTEM_EXT) # TODO(b/172480615): Remove when platform uses ART Module prebuilts by default. ifeq (,$(filter art_module,$(SOONG_CONFIG_NAMESPACES))) diff --git a/core/product.mk b/core/product.mk index 9aaf5eb300..41cd310745 100644 --- a/core/product.mk +++ b/core/product.mk @@ -429,6 +429,11 @@ _product_list_vars += PRODUCT_INTER_PARTITION_JAVA_LIBRARY_ALLOWLIST _product_single_value_vars += PRODUCT_INSTALL_EXTRA_FLATTENED_APEXES +# Install a copy of the debug policy to the system_ext partition, and allow +# init-second-stage to load debug policy from system_ext. +# This option is only meant to be set by GSI products. +_product_single_value_vars += PRODUCT_INSTALL_DEBUG_POLICY_TO_SYSTEM_EXT + .KATI_READONLY := _product_single_value_vars _product_list_vars _product_var_list :=$= $(_product_single_value_vars) $(_product_list_vars) diff --git a/core/product_config.mk b/core/product_config.mk index 8045337e29..08974efd2c 100644 --- a/core/product_config.mk +++ b/core/product_config.mk @@ -396,6 +396,12 @@ ifneq ($(filter-out 0 1,$(words $(PRODUCT_ADB_KEYS))),) $(error Only one file may be in PRODUCT_ADB_KEYS: $(PRODUCT_ADB_KEYS)) endif +ifdef PRODUCT_INSTALL_DEBUG_POLICY_TO_SYSTEM_EXT + ifeq (,$(filter gsi_arm gsi_arm64 gsi_x86 gsi_x86_64,$(PRODUCT_NAME))) + $(error Only GSI products are allowed to set PRODUCT_INSTALL_DEBUG_POLICY_TO_SYSTEM_EXT) + endif +endif + ifndef PRODUCT_USE_DYNAMIC_PARTITIONS PRODUCT_USE_DYNAMIC_PARTITIONS := $(PRODUCT_RETROFIT_DYNAMIC_PARTITIONS) endif |