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

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

Merge "Add sepolicy prebuilt dirs and variables to config" am: f6e4b7b7 

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

Change-Id: I65073069527242c153e01871b0d834cbcf3dfb5d
parents bda6a288 f6e4b7b7

core/android_soong_config_vars.mk

+4 −0
Original line number Diff line number Diff line
@@ -27,6 +27,10 @@ $(call add_soong_config_namespace,ANDROID) 
# Add variables to the namespace below:



$(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,BOARD_BUILD_SYSTEM_ROOT_IMAGE)

core/config.mk

+8 −0
Original line number Diff line number Diff line
@@ -840,6 +840,14 @@ 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 := \

    28.0 \

core/soong_config.mk

+4 −0
Original line number Diff line number Diff line
@@ -191,6 +191,10 @@ $(call add_json_list, PgoAdditionalProfileDirs, $(PGO_ADDITIONAL_PROFIL 


$(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))