tequilaOS/platform_system_sepolicy
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Remove 1000000.0 mapping files am: 23c543c0ed

Browse source 
Original change: https://android-review.googlesource.com/c/platform/system/sepolicy/+/3093740

Change-Id: I342c70bc77bd718d0152465809cd1f05402ccbb8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Inseob Kim 2024-05-20 06:46:46 +00:00 committed by Automerger Merge Worker
commit 9892ce9cee
2 changed files with 0 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
Android.bp
View file

@ -390,39 +390,6 @@ se_versioned_policy {
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
//////////////////////////////////

18
Android.mk
View file

@ -210,12 +210,6 @@ LOCAL_REQUIRED_MODULES += \
plat_sepolicy.cil \
secilc \
# HACK to support vendor blobs using 1000000.0
# TODO(b/314010177): remove after new ToT (202404) fully propagates
ifneq (true,$(RELEASE_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
@ -284,12 +278,6 @@ ifdef HAS_SYSTEM_EXT_PUBLIC_SEPOLICY
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,$(RELEASE_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)))
@ -338,12 +326,6 @@ ifdef HAS_PRODUCT_PUBLIC_SEPOLICY
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,$(RELEASE_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)))