marlin sepolicy: move service.te -> public/service.te
Types declared by service.te are depended on by vendor sepolicy and
private/service_contexts. We move service.te -> public/service.te
because service_contexts being on the /system side of a system-only-ota
can't depend on vendor policy.
Unfortunately, we don't have build-time tests to prevent system/product
*_contexts files from depending on vendor policy.
Bug: 119305624
Test: m selinux_policy
Change-Id: I0b0ca32e2e361cfa3d5e63fcafce15644b7c41b6
diff --git a/marlin/BoardConfig.mk b/marlin/BoardConfig.mk
index 1829c76..797faee 100644
--- a/marlin/BoardConfig.mk
+++ b/marlin/BoardConfig.mk
@@ -100,6 +100,7 @@
ifneq ($(filter marlin marlinf, $(TARGET_PRODUCT)),)
BOARD_SEPOLICY_DIRS += device/google/marlin/sepolicy/verizon
endif
+BOARD_PLAT_PUBLIC_SEPOLICY_DIR := device/google/marlin/sepolicy/public
BOARD_PLAT_PRIVATE_SEPOLICY_DIR := device/google/marlin/sepolicy/private
BOARD_EGL_CFG := device/google/marlin/egl.cfg
diff --git a/sailfish/BoardConfig.mk b/sailfish/BoardConfig.mk
index ed726bb..6cc647b 100644
--- a/sailfish/BoardConfig.mk
+++ b/sailfish/BoardConfig.mk
@@ -99,6 +99,7 @@
ifneq ($(filter sailfish sailfishf, $(TARGET_PRODUCT)),)
BOARD_SEPOLICY_DIRS += device/google/marlin/sepolicy/verizon
endif
+BOARD_PLAT_PUBLIC_SEPOLICY_DIR := device/google/marlin/sepolicy/public
BOARD_PLAT_PRIVATE_SEPOLICY_DIR := device/google/marlin/sepolicy/private
BOARD_EGL_CFG := device/google/marlin/egl.cfg
diff --git a/sepolicy/service.te b/sepolicy/public/service.te
similarity index 100%
rename from sepolicy/service.te
rename to sepolicy/public/service.te
