From c36ff859e95f23876da2b0bf8f5c7b054462b2cc Mon Sep 17 00:00:00 2001 From: Inseob Kim Date: Thu, 31 Aug 2023 16:49:35 +0900 Subject: [PATCH] Remove code about mixed sepolicy build There is no one actively using mixed sepolicy build, and it made sepolicy codes too complicated. As we are deprecating mixed build, removing such code for cleanup. Bug: 298305798 Test: boot cuttlefish Change-Id: I6efcfd7bde398564f909b41b3e156ac3d98d64d6 --- core/android_soong_config_vars.mk | 4 ---- core/config.mk | 8 -------- core/soong_config.mk | 9 --------- 3 files changed, 21 deletions(-) diff --git a/core/android_soong_config_vars.mk b/core/android_soong_config_vars.mk index f132d13775..b5c20d1ee8 100644 --- a/core/android_soong_config_vars.mk +++ b/core/android_soong_config_vars.mk @@ -29,10 +29,6 @@ $(call add_soong_config_namespace,ANDROID) $(call add_soong_config_var,ANDROID,TARGET_DYNAMIC_64_32_MEDIASERVER) $(call add_soong_config_var,ANDROID,TARGET_DYNAMIC_64_32_DRMSERVER) $(call add_soong_config_var,ANDROID,TARGET_ENABLE_MEDIADRM_64) -$(call add_soong_config_var,ANDROID,IS_TARGET_MIXED_SEPOLICY) -ifeq ($(IS_TARGET_MIXED_SEPOLICY),true) -$(call add_soong_config_var_value,ANDROID,MIXED_SEPOLICY_VERSION,$(BOARD_SEPOLICY_VERS)) -endif $(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,PRODUCT_INSTALL_DEBUG_POLICY_TO_SYSTEM_EXT) diff --git a/core/config.mk b/core/config.mk index ac49cece56..8ff85cf6ca 100644 --- a/core/config.mk +++ b/core/config.mk @@ -921,14 +921,6 @@ ifndef BOARD_SEPOLICY_VERS BOARD_SEPOLICY_VERS := $(PLATFORM_SEPOLICY_VERSION) endif -ifeq ($(BOARD_SEPOLICY_VERS),$(PLATFORM_SEPOLICY_VERSION)) -IS_TARGET_MIXED_SEPOLICY := -else -IS_TARGET_MIXED_SEPOLICY := true -endif - -.KATI_READONLY := IS_TARGET_MIXED_SEPOLICY - # A list of SEPolicy versions, besides PLATFORM_SEPOLICY_VERSION, that the framework supports. PLATFORM_SEPOLICY_COMPAT_VERSIONS := $(filter-out $(PLATFORM_SEPOLICY_VERSION), \ 29.0 \ diff --git a/core/soong_config.mk b/core/soong_config.mk index 7d8092ddc2..a4dbffad8b 100644 --- a/core/soong_config.mk +++ b/core/soong_config.mk @@ -206,17 +206,8 @@ $(call add_json_list, NamespacesToExport, $(PRODUCT_SOONG_NAMESPA $(call add_json_list, PgoAdditionalProfileDirs, $(PGO_ADDITIONAL_PROFILE_DIRS)) -$(call add_json_list, BoardPlatVendorPolicy, $(BOARD_PLAT_VENDOR_POLICY)) -$(call add_json_list, BoardReqdMaskPolicy, $(BOARD_REQD_MASK_POLICY)) -$(call add_json_list, BoardSystemExtPublicPrebuiltDirs, $(BOARD_SYSTEM_EXT_PUBLIC_PREBUILT_DIRS)) -$(call add_json_list, BoardSystemExtPrivatePrebuiltDirs, $(BOARD_SYSTEM_EXT_PRIVATE_PREBUILT_DIRS)) -$(call add_json_list, BoardProductPublicPrebuiltDirs, $(BOARD_PRODUCT_PUBLIC_PREBUILT_DIRS)) -$(call add_json_list, BoardProductPrivatePrebuiltDirs, $(BOARD_PRODUCT_PRIVATE_PREBUILT_DIRS)) $(call add_json_list, BoardVendorSepolicyDirs, $(BOARD_VENDOR_SEPOLICY_DIRS) $(BOARD_SEPOLICY_DIRS)) $(call add_json_list, BoardOdmSepolicyDirs, $(BOARD_ODM_SEPOLICY_DIRS)) -$(call add_json_list, BoardVendorDlkmSepolicyDirs, $(BOARD_VENDOR_DLKM_SEPOLICY_DIRS)) -$(call add_json_list, BoardOdmDlkmSepolicyDirs, $(BOARD_ODM_DLKM_SEPOLICY_DIRS)) -$(call add_json_list, BoardSystemDlkmSepolicyDirs, $(BOARD_SYSTEM_DLKM_SEPOLICY_DIRS)) $(call add_json_list, SystemExtPublicSepolicyDirs, $(SYSTEM_EXT_PUBLIC_SEPOLICY_DIRS)) $(call add_json_list, SystemExtPrivateSepolicyDirs, $(SYSTEM_EXT_PRIVATE_SEPOLICY_DIRS)) $(call add_json_list, BoardSepolicyM4Defs, $(BOARD_SEPOLICY_M4DEFS))