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

Commit 387befd6 authored by Inseob Kim's avatar Inseob Kim Committed by Automerger Merge Worker
Browse files

Merge "Remove code about mixed sepolicy build" into main am: 3c7a4232 

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



Change-Id: Ib7f7344c4b493afe0e70603f069a20b04cd4c90e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3ce34e4c 3c7a4232

core/android_soong_config_vars.mk

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

core/config.mk

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

core/soong_config.mk

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