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

Commit 2a4b948f authored by Yi-Yo Chiang's avatar Yi-Yo Chiang Committed by Automerger Merge Worker
Browse files

Merge "Reland: Add PRODUCT_INSTALL_DEBUG_POLICY_TO_SYSTEM_EXT" am: ad48e9cb 

Original change: https://android-review.googlesource.com/c/platform/build/+/1834754

Change-Id: I3318b0a47b0c5c1181b3dbdf676bcadf27781e6a
parents 685bfcdd ad48e9cb

core/android_soong_config_vars.mk

+1 −0
Original line number Diff line number Diff line
@@ -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)



ifeq (,$(filter com.google.android.conscrypt,$(PRODUCT_PACKAGES)))

  # Prebuilt module SDKs require prebuilt modules to work, and currently

core/product.mk

+5 −0
Original line number Diff line number Diff line
@@ -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)

core/product_config.mk

+6 −0
Original line number Diff line number Diff line
@@ -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