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

Don't create nonplat_service_contexts on full_treble devices am: e83f1e5609 am: 0d5bca443a

Browse source 
am: e06f443c59

Change-Id: Ib2245d6767275440d9c0ad775222d8c923e0281f
This commit is contained in:
Hung-ying Tyan 2017-09-07 16:44:14 +00:00 committed by android-build-merger
commit f3a6adfd49
2 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Android.mk
View file

@ -216,7 +216,6 @@ LOCAL_REQUIRED_MODULES += \
nonplat_mac_permissions.xml \ nonplat_mac_permissions.xml \
nonplat_property_contexts \ nonplat_property_contexts \
nonplat_seapp_contexts \ nonplat_seapp_contexts \
nonplat_service_contexts \
nonplat_hwservice_contexts \ nonplat_hwservice_contexts \
plat_file_contexts \ plat_file_contexts \
plat_mac_permissions.xml \ plat_mac_permissions.xml \
@ -226,6 +225,10 @@ LOCAL_REQUIRED_MODULES += \
plat_hwservice_contexts \ plat_hwservice_contexts \
vndservice_contexts \ vndservice_contexts \
ifneq ($(PRODUCT_FULL_TREBLE),true)
LOCAL_REQUIRED_MODULES += nonplat_service_contexts
endif
include $(BUILD_PHONY_PACKAGE) include $(BUILD_PHONY_PACKAGE)
################################## ##################################
@ -947,16 +950,15 @@ plat_svcfiles :=
plat_service_contexts.tmp := plat_service_contexts.tmp :=
################################## ##################################
# nonplat_service_contexts is only allowed on non-full-treble devices
ifneq ($(PRODUCT_FULL_TREBLE),true)
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_MODULE := nonplat_service_contexts LOCAL_MODULE := nonplat_service_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
else
LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT) LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT)
endif
include $(BUILD_SYSTEM)/base_rules.mk include $(BUILD_SYSTEM)/base_rules.mk
@ -979,6 +981,8 @@ built_nonplat_svc := $(LOCAL_BUILT_MODULE)
nonplat_svcfiles := nonplat_svcfiles :=
nonplat_service_contexts.tmp := nonplat_service_contexts.tmp :=
endif
################################## ##################################
include $(CLEAR_VARS) include $(CLEAR_VARS)

3
CleanSpec.mk
View file

@ -71,3 +71,6 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/etc/selinux/mapping_sepolicy
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/etc/selinux/plat_sepolicy.cil.sha256) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/etc/selinux/plat_sepolicy.cil.sha256)
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/etc/selinux/precompiled_sepolicy.plat.sha256) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/etc/selinux/precompiled_sepolicy.plat.sha256)
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/etc/selinux/mapping_sepolicy.cil) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/etc/selinux/mapping_sepolicy.cil)
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/etc/selinux/nonplat_service_contexts)
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/ETC/nonplat_service_contexts_intermediates)
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/NOTICE_FILES/src/vendor/etc/selinux/nonplat_service_contexts.txt)