Skip to content
Snippets Groups Projects
Commit 82658116 authored by Jeff Vander Stoep's avatar Jeff Vander Stoep Committed by android-build-merger
Browse files

Move non-treble devices to split file_contexts 

am: 7a68c5ae

Change-Id: Ide9c5ccdc2002972f311c9829c573b98f12fea44
parents 0f52004b 7a68c5ae
Branches
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Android.mk
+ 14
− 5
View file @ 82658116
...@@ -190,8 +190,6 @@ LOCAL_REQUIRED_MODULES += \ ...@@ -190,8 +190,6 @@ LOCAL_REQUIRED_MODULES += \
plat_sepolicy.cil \ plat_sepolicy.cil \
plat_and_mapping_sepolicy.cil.sha256 \ plat_and_mapping_sepolicy.cil.sha256 \
secilc \ secilc \
nonplat_file_contexts \
plat_file_contexts \
plat_sepolicy_vers.txt \ plat_sepolicy_vers.txt \
treble_sepolicy_tests treble_sepolicy_tests
...@@ -199,12 +197,15 @@ LOCAL_REQUIRED_MODULES += \ ...@@ -199,12 +197,15 @@ LOCAL_REQUIRED_MODULES += \
ifneq ($(PRODUCT_PRECOMPILED_SEPOLICY),false) ifneq ($(PRODUCT_PRECOMPILED_SEPOLICY),false)
LOCAL_REQUIRED_MODULES += precompiled_sepolicy precompiled_sepolicy.plat_and_mapping.sha256 LOCAL_REQUIRED_MODULES += precompiled_sepolicy precompiled_sepolicy.plat_and_mapping.sha256
endif endif
else else
# Use monolithic SELinux policy # Use monolithic SELinux policy
LOCAL_REQUIRED_MODULES += sepolicy \ LOCAL_REQUIRED_MODULES += sepolicy
file_contexts.bin
endif endif
LOCAL_REQUIRED_MODULES += \
nonplat_file_contexts \
plat_file_contexts
include $(BUILD_PHONY_PACKAGE) include $(BUILD_PHONY_PACKAGE)
################################## ##################################
...@@ -703,7 +704,11 @@ include $(CLEAR_VARS) ...@@ -703,7 +704,11 @@ include $(CLEAR_VARS)
LOCAL_MODULE := plat_file_contexts LOCAL_MODULE := plat_file_contexts
LOCAL_MODULE_CLASS := ETC LOCAL_MODULE_CLASS := ETC
LOCAL_MODULE_TAGS := optional LOCAL_MODULE_TAGS := optional
ifeq ($(PRODUCT_FULL_TREBLE),true)
LOCAL_MODULE_PATH := $(TARGET_OUT)/etc/selinux LOCAL_MODULE_PATH := $(TARGET_OUT)/etc/selinux
else
LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT)
endif
include $(BUILD_SYSTEM)/base_rules.mk include $(BUILD_SYSTEM)/base_rules.mk
...@@ -733,7 +738,11 @@ include $(CLEAR_VARS) ...@@ -733,7 +738,11 @@ include $(CLEAR_VARS)
LOCAL_MODULE := nonplat_file_contexts LOCAL_MODULE := nonplat_file_contexts
LOCAL_MODULE_CLASS := ETC LOCAL_MODULE_CLASS := ETC
LOCAL_MODULE_TAGS := optional LOCAL_MODULE_TAGS := optional
ifeq ($(PRODUCT_FULL_TREBLE),true)
LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/etc/selinux LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/etc/selinux
else
LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT)
endif
include $(BUILD_SYSTEM)/base_rules.mk include $(BUILD_SYSTEM)/base_rules.mk
......
private/file_contexts
+ 0
− 1
View file @ 82658116
...@@ -38,7 +38,6 @@ ...@@ -38,7 +38,6 @@
/sdcard u:object_r:rootfs:s0 /sdcard u:object_r:rootfs:s0
# SELinux policy files # SELinux policy files
/file_contexts\.bin u:object_r:file_contexts_file:s0
/nonplat_file_contexts u:object_r:file_contexts_file:s0 /nonplat_file_contexts u:object_r:file_contexts_file:s0
/plat_file_contexts u:object_r:file_contexts_file:s0 /plat_file_contexts u:object_r:file_contexts_file:s0
/mapping_sepolicy\.cil u:object_r:sepolicy_file:s0 /mapping_sepolicy\.cil u:object_r:sepolicy_file:s0
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment