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

Commit e8d2203a authored by Karthik Rathlavath's avatar Karthik Rathlavath Committed by Inseob Kim
Browse files

change to convert PrebuiltApiDir of systemExt and product partitions from string to list of string 


converting SystemExtSepolicyPrebuiltApiDir and ProductSepolicyPrebuiltApiDir from string to list of strings and changing sepolicy variable from HAS_BOARD_SYSTEM_EXT_PREBUILT_DIR to HAS_BOARD_SYSTEM_EXT_SEPOLICY_PREBUILT_DIRS and HAS_BOARD_PRODUCT_PREBUILT_DIR to HAS_BOARD_PRODUCT_SEPOLICY_PREBUILT_DIRS


Bug: 406924614
Test: TH
Change-Id: I06992a2f084163995544ffdfa079db9313eb5a04
parent 64ac4c24

core/android_soong_config_vars.mk

+2 −2
Original line number Diff line number Diff line
@@ -30,8 +30,8 @@ $(call add_soong_config_var,ANDROID,BOARD_USES_ODMIMAGE) 
$(call soong_config_set_bool,ANDROID,BOARD_USES_RECOVERY_AS_BOOT,$(BOARD_USES_RECOVERY_AS_BOOT))

$(call soong_config_set_bool,ANDROID,BOARD_MOVE_GSI_AVB_KEYS_TO_VENDOR_BOOT,$(BOARD_MOVE_GSI_AVB_KEYS_TO_VENDOR_BOOT))

$(call add_soong_config_var,ANDROID,CHECK_DEV_TYPE_VIOLATIONS)

$(call soong_config_set_bool,ANDROID,HAS_BOARD_SYSTEM_EXT_PREBUILT_DIR,$(if $(BOARD_SYSTEM_EXT_PREBUILT_DIR),true,false))

$(call soong_config_set_bool,ANDROID,HAS_BOARD_PRODUCT_PREBUILT_DIR,$(if $(BOARD_PRODUCT_PREBUILT_DIR),true,false))

$(call soong_config_set_bool,ANDROID,HAS_BOARD_SYSTEM_EXT_SEPOLICY_PREBUILT_DIRS,$(if $(BOARD_SYSTEM_EXT_SEPOLICY_PREBUILT_DIRS),true,false))

$(call soong_config_set_bool,ANDROID,HAS_BOARD_PRODUCT_SEPOLICY_PREBUILT_DIRS,$(if $(BOARD_PRODUCT_SEPOLICY_PREBUILT_DIRS),true,false))

$(call add_soong_config_var,ANDROID,PLATFORM_SEPOLICY_VERSION)

$(call add_soong_config_var,ANDROID,PLATFORM_SEPOLICY_COMPAT_VERSIONS)

$(call add_soong_config_var,ANDROID,PRODUCT_INSTALL_DEBUG_POLICY_TO_SYSTEM_EXT)

core/config.mk

+10 −0
Original line number Diff line number Diff line
@@ -45,6 +45,8 @@ CHANGES_URL := https://android.googlesource.com/platform/build/+/master/Changes. 
$(KATI_deprecated_var TARGET_USES_64_BIT_BINDER,All devices use 64-bit binder by default now. Uses of TARGET_USES_64_BIT_BINDER should be removed.)

$(KATI_deprecated_var PRODUCT_SEPOLICY_SPLIT,All devices are built with split sepolicy.)

$(KATI_deprecated_var PRODUCT_SEPOLICY_SPLIT_OVERRIDE,All devices are built with split sepolicy.)

$(KATI_deprecated_var BOARD_SYSTEM_EXT_PREBUILT_DIR,Use BOARD_SYSTEM_EXT_SEPOLICY_PREBUILT_DIRS instead)

$(KATI_deprecated_var BOARD_PRODUCT_PREBUILT_DIR,Use BOARD_PRODUCT_SEPOLICY_PREBUILT_DIRS instead)

$(KATI_obsolete_var PATH,Do not use PATH directly. See $(CHANGES_URL)#PATH)

$(KATI_obsolete_var PYTHONPATH,Do not use PYTHONPATH directly. See $(CHANGES_URL)#PYTHONPATH)

$(KATI_obsolete_var OUT,Use OUT_DIR instead. See $(CHANGES_URL)#OUT)
@@ -897,6 +899,14 @@ ifeq ($(call math_gt,$(BOARD_API_LEVEL),$(BOARD_GENFS_LABELS_VERSION)),true) 
  $(error BOARD_GENFS_LABELS_VERSION ($(BOARD_GENFS_LABELS_VERSION)) must be greater than or equal to BOARD_API_LEVEL ($(BOARD_API_LEVEL)))

endif



ifneq (,$(BOARD_SYSTEM_EXT_PREBUILT_DIR))

BOARD_SYSTEM_EXT_SEPOLICY_PREBUILT_DIRS += $(BOARD_SYSTEM_EXT_PREBUILT_DIR)

endif



ifneq (,$(BOARD_PRODUCT_PREBUILT_DIR))

BOARD_PRODUCT_SEPOLICY_PREBUILT_DIRS += $(BOARD_PRODUCT_PREBUILT_DIR)

endif



ifeq ($(PRODUCT_USE_DYNAMIC_PARTITIONS),true)

    ifneq ($(PRODUCT_USE_DYNAMIC_PARTITION_SIZE),true)

        $(error PRODUCT_USE_DYNAMIC_PARTITION_SIZE must be true for devices with dynamic partitions)

core/soong_config.mk

+2 −2
Original line number Diff line number Diff line
@@ -217,8 +217,8 @@ $(call add_json_list, SystemExtPublicSepolicyDirs, $(SYSTEM_EXT_PUBLIC_SEP 
$(call add_json_list, SystemExtPrivateSepolicyDirs,      $(SYSTEM_EXT_PRIVATE_SEPOLICY_DIRS))

$(call add_json_list, BoardSepolicyM4Defs,               $(BOARD_SEPOLICY_M4DEFS))

$(call add_json_str,  BoardSepolicyVers,                 $(BOARD_SEPOLICY_VERS))

$(call add_json_str,  SystemExtSepolicyPrebuiltApiDir,   $(BOARD_SYSTEM_EXT_PREBUILT_DIR))

$(call add_json_str,  ProductSepolicyPrebuiltApiDir,     $(BOARD_PRODUCT_PREBUILT_DIR))

$(call add_json_list, SystemExtSepolicyPrebuiltApiDirs,  $(BOARD_SYSTEM_EXT_SEPOLICY_PREBUILT_DIRS))

$(call add_json_list, ProductSepolicyPrebuiltApiDirs,    $(BOARD_PRODUCT_SEPOLICY_PREBUILT_DIRS))

$(call add_json_str,  BoardPlatform,                     $(TARGET_BOARD_PLATFORM))



$(call add_json_str,  PlatformSepolicyVersion,           $(PLATFORM_SEPOLICY_VERSION))