diff --git a/core/android_soong_config_vars.mk b/core/android_soong_config_vars.mk index 4aba87ea59..2197eb968c 100644 --- a/core/android_soong_config_vars.mk +++ b/core/android_soong_config_vars.mk @@ -30,7 +30,6 @@ $(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 41cd310745..9aaf5eb300 100644 --- a/core/product.mk +++ b/core/product.mk @@ -429,11 +429,6 @@ _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 08974efd2c..8045337e29 100644 --- a/core/product_config.mk +++ b/core/product_config.mk @@ -396,12 +396,6 @@ 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