diff --git a/core/product.mk b/core/product.mk index b069dda679..7192226884 100644 --- a/core/product.mk +++ b/core/product.mk @@ -445,7 +445,7 @@ _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. +# This option is only meant to be set by compliance GSI targets. _product_single_value_vars += PRODUCT_INSTALL_DEBUG_POLICY_TO_SYSTEM_EXT # If set, metadata files for the following artifacts will be generated. diff --git a/core/product_config.mk b/core/product_config.mk index 57b7724f13..6fae73ea19 100644 --- a/core/product_config.mk +++ b/core/product_config.mk @@ -420,9 +420,15 @@ ifneq ($(filter-out 0 1,$(words $(PRODUCT_ADB_KEYS))),) $(error Only one file may be in PRODUCT_ADB_KEYS: $(PRODUCT_ADB_KEYS)) endif +# Show a warning wall of text if non-compliance-GSI products set this option. 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) + ifeq (,$(filter gsi_arm gsi_arm64 gsi_x86 gsi_x86_64 gsi_car_arm64 gsi_car_x86_64,$(PRODUCT_NAME))) + $(warning PRODUCT_INSTALL_DEBUG_POLICY_TO_SYSTEM_EXT is set but \ + PRODUCT_NAME ($(PRODUCT_NAME)) doesn't look like a GSI for compliance \ + testing. This is a special configuration for compliance GSI, so do make \ + sure you understand the security implications before setting this \ + option. If you don't know what this option does, then you probably \ + shouldn't set this.) endif endif