From bfe25fe702023975081a959bedbcf4dc548074a6 Mon Sep 17 00:00:00 2001 From: Inseob Kim Date: Wed, 15 Dec 2021 22:44:21 +0900 Subject: [PATCH] Add sepolicy prebuilt dirs and variables to config These are used when we build vendor sepolicy against old plat sepolicy. Bug: 33691272 Test: build Change-Id: I847108539b3b9d7d25c0fad9eddc017275a564be --- core/android_soong_config_vars.mk | 4 ++++ core/config.mk | 8 ++++++++ core/soong_config.mk | 4 ++++ 3 files changed, 16 insertions(+) diff --git a/core/android_soong_config_vars.mk b/core/android_soong_config_vars.mk index d24449b5d0..d4bdbbddc9 100644 --- a/core/android_soong_config_vars.mk +++ b/core/android_soong_config_vars.mk @@ -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) diff --git a/core/config.mk b/core/config.mk index bfff84e4b6..e146f642b8 100644 --- a/core/config.mk +++ b/core/config.mk @@ -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 \ diff --git a/core/soong_config.mk b/core/soong_config.mk index 617abdf6c5..07dafc7c2b 100644 --- a/core/soong_config.mk +++ b/core/soong_config.mk @@ -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))