Add 1000000.0 mapping file temporarily
Will be removed once new ToT (202404) propagates.
Bug: 314010177
Test: build and boot
Test: TH
Change-Id: I6913e953aa479eaf0be15ddf9fd8047b00d58fe3
diff --git a/Android.bp b/Android.bp
index 88107cc..1d8e5dd 100644
--- a/Android.bp
+++ b/Android.bp
@@ -337,6 +337,36 @@
product_specific: true,
}
+// HACK to support vendor blobs using 1000000.0
+// TODO(b/314010177): remove after new ToT (202404) fully propagates
+se_versioned_policy {
+ name: "plat_mapping_file_1000000.0",
+ base: ":plat_pub_policy.cil",
+ mapping: true,
+ version: "1000000.0",
+ relative_install_path: "mapping", // install to /system/etc/selinux/mapping
+}
+
+se_versioned_policy {
+ name: "system_ext_mapping_file_1000000.0",
+ base: ":system_ext_pub_policy.cil",
+ mapping: true,
+ version: "1000000.0",
+ filter_out: [":plat_mapping_file"],
+ relative_install_path: "mapping", // install to /system_ext/etc/selinux/mapping
+ system_ext_specific: true,
+}
+
+se_versioned_policy {
+ name: "product_mapping_file_1000000.0",
+ base: ":pub_policy.cil",
+ mapping: true,
+ version: "1000000.0",
+ filter_out: [":plat_mapping_file", ":system_ext_mapping_file"],
+ relative_install_path: "mapping", // install to /product/etc/selinux/mapping
+ product_specific: true,
+}
+
//////////////////////////////////
// vendor/odm sepolicy
//////////////////////////////////
diff --git a/Android.mk b/Android.mk
index fe6a773..8a38682 100644
--- a/Android.mk
+++ b/Android.mk
@@ -210,6 +210,12 @@
plat_sepolicy.cil \
secilc \
+# HACK to support vendor blobs using 1000000.0
+# TODO(b/314010177): remove after new ToT (202404) fully propagates
+ifneq (true,$(BOARD_API_LEVEL_FROZEN))
+LOCAL_REQUIRED_MODULES += plat_mapping_file_1000000.0
+endif
+
ifneq ($(PRODUCT_PRECOMPILED_SEPOLICY),false)
LOCAL_REQUIRED_MODULES += plat_sepolicy_and_mapping.sha256
endif
@@ -278,6 +284,12 @@
LOCAL_REQUIRED_MODULES += \
system_ext_mapping_file
+# HACK to support vendor blobs using 1000000.0
+# TODO(b/314010177): remove after new ToT (202404) fully propagates
+ifneq (true,$(BOARD_API_LEVEL_FROZEN))
+LOCAL_REQUIRED_MODULES += system_ext_mapping_file_1000000.0
+endif
+
system_ext_compat_files := $(call build_policy, $(sepolicy_compat_files), $(SYSTEM_EXT_PRIVATE_POLICY))
LOCAL_REQUIRED_MODULES += $(addprefix system_ext_, $(notdir $(system_ext_compat_files)))
@@ -326,6 +338,12 @@
LOCAL_REQUIRED_MODULES += \
product_mapping_file
+# HACK to support vendor blobs using 1000000.0
+# TODO(b/314010177): remove after new ToT (202404) fully propagates
+ifneq (true,$(BOARD_API_LEVEL_FROZEN))
+LOCAL_REQUIRED_MODULES += product_mapping_file_1000000.0
+endif
+
product_compat_files := $(call build_policy, $(sepolicy_compat_files), $(PRODUCT_PRIVATE_POLICY))
LOCAL_REQUIRED_MODULES += $(addprefix product_, $(notdir $(product_compat_files)))