From cd0e477d8fca9e8cd4bae2a0e296a048945614c1 Mon Sep 17 00:00:00 2001 From: Inseob Kim Date: Mon, 15 Apr 2019 20:32:14 +0900 Subject: [PATCH] Build contexts files with Soong This is to migrate sepolicy Makefiles into Soong. For the first part, file_contexts, hwservice_contexts, property_contexts, and service_contexts are migrated. Build-time tests for contexts files are still in Makefile; they will also be done with Soong after porting the module sepolicy. The motivation of migrating is based on generating property_contexts dynamically: if we were to amend contexts files at build time in the future, it would be nicer to manage them in Soong. To do that, building contexts files with Soong can be very helpful. Bug: 127949646 Bug: 129377144 Test: 1) Build blueline-userdebug, flash, and boot. Test: 2) Build blueline-userdebug with TARGET_FLATTEN_APEX=true, flash, and boot. Test: 3) Build aosp_arm-userdebug. Change-Id: I486f7065207468697320776f726b732077656c6c --- core/soong_config.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/core/soong_config.mk b/core/soong_config.mk index 46e026aec2..19326dd6fd 100644 --- a/core/soong_config.mk +++ b/core/soong_config.mk @@ -149,6 +149,7 @@ $(call add_json_list, BoardVendorSepolicyDirs, $(BOARD_SEPOLICY_DIRS)) $(call add_json_list, BoardOdmSepolicyDirs, $(BOARD_ODM_SEPOLICY_DIRS)) $(call add_json_list, BoardPlatPublicSepolicyDirs, $(BOARD_PLAT_PUBLIC_SEPOLICY_DIR)) $(call add_json_list, BoardPlatPrivateSepolicyDirs, $(BOARD_PLAT_PRIVATE_SEPOLICY_DIR)) +$(call add_json_list, BoardSepolicyM4Defs, $(BOARD_SEPOLICY_M4DEFS)) $(call add_json_bool, FlattenApex, $(filter true,$(TARGET_FLATTEN_APEX))) @@ -165,6 +166,10 @@ $(call add_json_list, ProductHiddenAPIStubs, $(PRODUCT_HIDDENAPI_STU $(call add_json_list, ProductHiddenAPIStubsSystem, $(PRODUCT_HIDDENAPI_STUBS_SYSTEM)) $(call add_json_list, ProductHiddenAPIStubsTest, $(PRODUCT_HIDDENAPI_STUBS_TEST)) +$(call add_json_list, ProductPublicSepolicyDirs, $(PRODUCT_PUBLIC_SEPOLICY_DIRS)) +$(call add_json_list, ProductPrivateSepolicyDirs, $(PRODUCT_PRIVATE_SEPOLICY_DIRS)) +$(call add_json_bool, ProductCompatibleProperty, $(PRODUCT_COMPATIBLE_PROPERTY)) + $(call add_json_list, TargetFSConfigGen, $(TARGET_FS_CONFIG_GEN)) $(call add_json_map, VendorVars)