From a0884b90aeafa734a10caea4f336b9a0bcd55581 Mon Sep 17 00:00:00 2001 From: Inseob Kim Date: Mon, 21 Dec 2020 22:52:22 +0900 Subject: [PATCH 1/3] Add PRODUCT_SHIPPING_API_LEVEL to productVariables Bug: 175526482 Test: m selinux_policy Change-Id: I10195730e47398bdb455d554a1cb7d6b7ac28634 --- core/soong_config.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/core/soong_config.mk b/core/soong_config.mk index fde5832f03..92f1509f02 100644 --- a/core/soong_config.mk +++ b/core/soong_config.mk @@ -239,6 +239,8 @@ $(call add_json_list, BoardKernelModuleInterfaceVersions, $(BOARD_KERNEL_MODULE_ $(call add_json_bool, BoardMoveRecoveryResourcesToVendorBoot, $(BOARD_MOVE_RECOVERY_RESOURCES_TO_VENDOR_BOOT)) $(call add_json_str, PrebuiltHiddenApiDir, $(BOARD_PREBUILT_HIDDENAPI_DIR)) +$(call add_json_str, ShippingApiLevel, $(PRODUCT_SHIPPING_API_LEVEL)) + $(call json_end) $(file >$(SOONG_VARIABLES).tmp,$(json_contents)) From 43f4ef0221e7071c0300e397e96da0e3aa3d0daa Mon Sep 17 00:00:00 2001 From: Inseob Kim Date: Wed, 3 Feb 2021 18:17:49 +0900 Subject: [PATCH 2/3] Add BUILD_BROKEN_VENDOR_PROPERTY_NAMESPACE to BoardConfig Bug: 175526482 Test: m vendor_property_contexts after making violations Change-Id: I81512fefbe952ecaf31fd4b5d276fd32c6253c7f --- core/board_config.mk | 1 + core/soong_config.mk | 2 ++ 2 files changed, 3 insertions(+) diff --git a/core/board_config.mk b/core/board_config.mk index 725c0a54f9..183bdbb31e 100644 --- a/core/board_config.mk +++ b/core/board_config.mk @@ -129,6 +129,7 @@ _build_broken_var_list := \ BUILD_BROKEN_PREBUILT_ELF_FILES \ BUILD_BROKEN_TREBLE_SYSPROP_NEVERALLOW \ BUILD_BROKEN_USES_NETWORK \ + BUILD_BROKEN_VENDOR_PROPERTY_NAMESPACE \ BUILD_BROKEN_VINTF_PRODUCT_COPY_FILES \ _build_broken_var_list += \ diff --git a/core/soong_config.mk b/core/soong_config.mk index 92f1509f02..a4b87ea2f9 100644 --- a/core/soong_config.mk +++ b/core/soong_config.mk @@ -241,6 +241,8 @@ $(call add_json_str, PrebuiltHiddenApiDir, $(BOARD_PREBUILT_HIDDENAPI_DIR)) $(call add_json_str, ShippingApiLevel, $(PRODUCT_SHIPPING_API_LEVEL)) +$(call add_json_bool, BuildBrokenVendorPropertyNamespace, $(BUILD_BROKEN_VENDOR_PROPERTY_NAMESPACE)) + $(call json_end) $(file >$(SOONG_VARIABLES).tmp,$(json_contents)) From 05d595194bd8dd7fc962b9c3a403abf45d5b9bab Mon Sep 17 00:00:00 2001 From: Inseob Kim Date: Wed, 3 Feb 2021 18:35:37 +0900 Subject: [PATCH 3/3] Set BUILD_BROKEN_VENDOR_PROPERTY_NAMESPACE for goldfish device/generic/goldfish/sepolicy/common/property_contexts still contains violations, so temporarily setting build_broken to relax vendor property check. Bug: 176210699 Test: m vendor_property_contexts Change-Id: Ia7d7830a7e994fd0766fd8854524bb6f9fa5cce6 --- target/board/BoardConfigEmuCommon.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/target/board/BoardConfigEmuCommon.mk b/target/board/BoardConfigEmuCommon.mk index 342abd71ec..fe0293b805 100644 --- a/target/board/BoardConfigEmuCommon.mk +++ b/target/board/BoardConfigEmuCommon.mk @@ -90,3 +90,6 @@ BOARD_FLASH_BLOCK_SIZE := 512 DEVICE_MATRIX_FILE := device/generic/goldfish/compatibility_matrix.xml BOARD_SEPOLICY_DIRS += device/generic/goldfish/sepolicy/common + +# b/176210699: remove this +BUILD_BROKEN_VENDOR_PROPERTY_NAMESPACE := true