wayne-common: Add BOARD_PLAT_[PUBLIC|PRIVATE]_SEPOLICY_DIR

Move vendor policy to vendor and add a place for system extensions.
Also add such an extension: a labeling of the qti.ims.ext service.

Bug: 38151691
Bug: 62041272
Test: Policy binary identical before and after, except plat_service_contexts
has new service added.

Change-Id: I1493c4c8876c4446a1de46b39942098bf49c79f8

40 files changed, 3 insertions, 2 deletions

diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index befbc88..f04cd85 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -254,8 +254,9 @@ PROTOBUF_SUPPORTED := true
 
 # SELinux
 include device/qcom/sepolicy/sepolicy.mk
-BOARD_SEPOLICY_DIRS += \
-    $(COMMON_PATH)/sepolicy
+BOARD_SEPOLICY_DIRS += $(COMMON_PATH)/sepolicy/vendor
+BOARD_PLAT_PUBLIC_SEPOLICY_DIR += $(COMMON_PATH)/sepolicy/public
+BOARD_PLAT_PRIVATE_SEPOLICY_DIR += $(COMMON_PATH)/sepolicy/private
 
 # Treble
 PRODUCT_FULL_TREBLE_OVERRIDE := true
diff --git a/sepolicy/app.te b/sepolicy/vendor/app.te
index c61957b..c61957b 100644
--- a/sepolicy/app.te
+++ b/sepolicy/vendor/app.te
diff --git a/sepolicy/atfwd.te b/sepolicy/vendor/atfwd.te
index a60277a..a60277a 100644
--- a/sepolicy/atfwd.te
+++ b/sepolicy/vendor/atfwd.te
diff --git a/sepolicy/device.te b/sepolicy/vendor/device.te
index b84e726..b84e726 100644
--- a/sepolicy/device.te
+++ b/sepolicy/vendor/device.te
diff --git a/sepolicy/file.te b/sepolicy/vendor/file.te
index 2ca38b9..2ca38b9 100644
--- a/sepolicy/file.te
+++ b/sepolicy/vendor/file.te
diff --git a/sepolicy/file_contexts b/sepolicy/vendor/file_contexts
index 6939ff5..6939ff5 100644
--- a/sepolicy/file_contexts
+++ b/sepolicy/vendor/file_contexts
diff --git a/sepolicy/genfs_contexts b/sepolicy/vendor/genfs_contexts
index 638c917..638c917 100644
--- a/sepolicy/genfs_contexts
+++ b/sepolicy/vendor/genfs_contexts
diff --git a/sepolicy/hal_audio_default.te b/sepolicy/vendor/hal_audio_default.te
index 128920f..128920f 100644
--- a/sepolicy/hal_audio_default.te
+++ b/sepolicy/vendor/hal_audio_default.te
diff --git a/sepolicy/hal_camera_default.te b/sepolicy/vendor/hal_camera_default.te
index 0f40bbd..0f40bbd 100644
--- a/sepolicy/hal_camera_default.te
+++ b/sepolicy/vendor/hal_camera_default.te
diff --git a/sepolicy/hal_cas_default.te b/sepolicy/vendor/hal_cas_default.te
index 18b00de..18b00de 100644
--- a/sepolicy/hal_cas_default.te
+++ b/sepolicy/vendor/hal_cas_default.te
diff --git a/sepolicy/hal_fingerprint_wayne.te b/sepolicy/vendor/hal_fingerprint_wayne.te
index 11a99de..11a99de 100644
--- a/sepolicy/hal_fingerprint_wayne.te
+++ b/sepolicy/vendor/hal_fingerprint_wayne.te
diff --git a/sepolicy/hal_gnss_qti.te b/sepolicy/vendor/hal_gnss_qti.te
index 711c8bb..711c8bb 100644
--- a/sepolicy/hal_gnss_qti.te
+++ b/sepolicy/vendor/hal_gnss_qti.te
diff --git a/sepolicy/hal_graphics_composer_default.te b/sepolicy/vendor/hal_graphics_composer_default.te
index 39e8fb4..39e8fb4 100644
--- a/sepolicy/hal_graphics_composer_default.te
+++ b/sepolicy/vendor/hal_graphics_composer_default.te
diff --git a/sepolicy/hal_ir_default.te b/sepolicy/vendor/hal_ir_default.te
index 2f9f2b6..2f9f2b6 100644
--- a/sepolicy/hal_ir_default.te
+++ b/sepolicy/vendor/hal_ir_default.te
diff --git a/sepolicy/hal_light_default.te b/sepolicy/vendor/hal_light_default.te
index e0592d7..e0592d7 100644
--- a/sepolicy/hal_light_default.te
+++ b/sepolicy/vendor/hal_light_default.te
diff --git a/sepolicy/hal_mlipay_default.te b/sepolicy/vendor/hal_mlipay_default.te
index c6f721c..c6f721c 100644
--- a/sepolicy/hal_mlipay_default.te
+++ b/sepolicy/vendor/hal_mlipay_default.te
diff --git a/sepolicy/hal_power_default.te b/sepolicy/vendor/hal_power_default.te
index 2df04b0..2df04b0 100644
--- a/sepolicy/hal_power_default.te
+++ b/sepolicy/vendor/hal_power_default.te
diff --git a/sepolicy/hal_sensors_default.te b/sepolicy/vendor/hal_sensors_default.te
index 28414f9..28414f9 100644
--- a/sepolicy/hal_sensors_default.te
+++ b/sepolicy/vendor/hal_sensors_default.te
diff --git a/sepolicy/hvdcp.te b/sepolicy/vendor/hvdcp.te
index 49a6b78..49a6b78 100644
--- a/sepolicy/hvdcp.te
+++ b/sepolicy/vendor/hvdcp.te
diff --git a/sepolicy/hwservice.te b/sepolicy/vendor/hwservice.te
index 32adecb..32adecb 100644
--- a/sepolicy/hwservice.te
+++ b/sepolicy/vendor/hwservice.te
diff --git a/sepolicy/hwservice_contexts b/sepolicy/vendor/hwservice_contexts
index 8ff7ae7..8ff7ae7 100644
--- a/sepolicy/hwservice_contexts
+++ b/sepolicy/vendor/hwservice_contexts
diff --git a/sepolicy/hwservicemanager.te b/sepolicy/vendor/hwservicemanager.te
index 3262afb..3262afb 100644
--- a/sepolicy/hwservicemanager.te
+++ b/sepolicy/vendor/hwservicemanager.te
diff --git a/sepolicy/init.te b/sepolicy/vendor/init.te
index 734baea..734baea 100644
--- a/sepolicy/init.te
+++ b/sepolicy/vendor/init.te
diff --git a/sepolicy/init_fingerprint.te b/sepolicy/vendor/init_fingerprint.te
index b45cdd6..b45cdd6 100644
--- a/sepolicy/init_fingerprint.te
+++ b/sepolicy/vendor/init_fingerprint.te
diff --git a/sepolicy/kernel.te b/sepolicy/vendor/kernel.te
index 9ba3537..9ba3537 100644
--- a/sepolicy/kernel.te
+++ b/sepolicy/vendor/kernel.te
diff --git a/sepolicy/location.te b/sepolicy/vendor/location.te
index 4333581..4333581 100644
--- a/sepolicy/location.te
+++ b/sepolicy/vendor/location.te
diff --git a/sepolicy/netmgrd.te b/sepolicy/vendor/netmgrd.te
index 47ce266..47ce266 100644
--- a/sepolicy/netmgrd.te
+++ b/sepolicy/vendor/netmgrd.te
diff --git a/sepolicy/priv_app.te b/sepolicy/vendor/priv_app.te
index 7ae851d..7ae851d 100644
--- a/sepolicy/priv_app.te
+++ b/sepolicy/vendor/priv_app.te
diff --git a/sepolicy/property.te b/sepolicy/vendor/property.te
index 313445c..313445c 100644
--- a/sepolicy/property.te
+++ b/sepolicy/vendor/property.te
diff --git a/sepolicy/property_contexts b/sepolicy/vendor/property_contexts
index 037565e..037565e 100644
--- a/sepolicy/property_contexts
+++ b/sepolicy/vendor/property_contexts
diff --git a/sepolicy/qti_init_shell.te b/sepolicy/vendor/qti_init_shell.te
index aa81398..aa81398 100644
--- a/sepolicy/qti_init_shell.te
+++ b/sepolicy/vendor/qti_init_shell.te
diff --git a/sepolicy/rild.te b/sepolicy/vendor/rild.te
index 06625de..06625de 100644
--- a/sepolicy/rild.te
+++ b/sepolicy/vendor/rild.te
diff --git a/sepolicy/system_app.te b/sepolicy/vendor/system_app.te
index c7d0026..c7d0026 100644
--- a/sepolicy/system_app.te
+++ b/sepolicy/vendor/system_app.te
diff --git a/sepolicy/system_server.te b/sepolicy/vendor/system_server.te
index c9135cf..c9135cf 100644
--- a/sepolicy/system_server.te
+++ b/sepolicy/vendor/system_server.te
diff --git a/sepolicy/tee.te b/sepolicy/vendor/tee.te
index 0a124bc..0a124bc 100644
--- a/sepolicy/tee.te
+++ b/sepolicy/vendor/tee.te
diff --git a/sepolicy/thermal-engine.te b/sepolicy/vendor/thermal-engine.te
index 0e03308..0e03308 100644
--- a/sepolicy/thermal-engine.te
+++ b/sepolicy/vendor/thermal-engine.te
diff --git a/sepolicy/vendor_init.te b/sepolicy/vendor/vendor_init.te
index 9f602b1..9f602b1 100644
--- a/sepolicy/vendor_init.te
+++ b/sepolicy/vendor/vendor_init.te
diff --git a/sepolicy/vndservice.te b/sepolicy/vendor/vndservice.te
index ebc594c..ebc594c 100644
--- a/sepolicy/vndservice.te
+++ b/sepolicy/vendor/vndservice.te
diff --git a/sepolicy/vndservice_contexts b/sepolicy/vendor/vndservice_contexts
index 92d3f21..92d3f21 100644
--- a/sepolicy/vndservice_contexts
+++ b/sepolicy/vendor/vndservice_contexts
diff --git a/sepolicy/vndservicemanager.te b/sepolicy/vendor/vndservicemanager.te
index 8d04dea..8d04dea 100644
--- a/sepolicy/vndservicemanager.te
+++ b/sepolicy/vendor/vndservicemanager.te