diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk index 41990c62..d0643da5 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 similarity index 100% rename from sepolicy/app.te rename to sepolicy/vendor/app.te diff --git a/sepolicy/atfwd.te b/sepolicy/vendor/atfwd.te similarity index 100% rename from sepolicy/atfwd.te rename to sepolicy/vendor/atfwd.te diff --git a/sepolicy/device.te b/sepolicy/vendor/device.te similarity index 100% rename from sepolicy/device.te rename to sepolicy/vendor/device.te diff --git a/sepolicy/file.te b/sepolicy/vendor/file.te similarity index 100% rename from sepolicy/file.te rename to sepolicy/vendor/file.te diff --git a/sepolicy/file_contexts b/sepolicy/vendor/file_contexts similarity index 100% rename from sepolicy/file_contexts rename to sepolicy/vendor/file_contexts diff --git a/sepolicy/genfs_contexts b/sepolicy/vendor/genfs_contexts similarity index 100% rename from sepolicy/genfs_contexts rename to sepolicy/vendor/genfs_contexts diff --git a/sepolicy/hal_audio_default.te b/sepolicy/vendor/hal_audio_default.te similarity index 100% rename from sepolicy/hal_audio_default.te rename to sepolicy/vendor/hal_audio_default.te diff --git a/sepolicy/hal_camera_default.te b/sepolicy/vendor/hal_camera_default.te similarity index 100% rename from sepolicy/hal_camera_default.te rename to sepolicy/vendor/hal_camera_default.te diff --git a/sepolicy/hal_cas_default.te b/sepolicy/vendor/hal_cas_default.te similarity index 100% rename from sepolicy/hal_cas_default.te rename to sepolicy/vendor/hal_cas_default.te diff --git a/sepolicy/hal_fingerprint_wayne.te b/sepolicy/vendor/hal_fingerprint_wayne.te similarity index 100% rename from sepolicy/hal_fingerprint_wayne.te rename to sepolicy/vendor/hal_fingerprint_wayne.te diff --git a/sepolicy/hal_gnss_qti.te b/sepolicy/vendor/hal_gnss_qti.te similarity index 100% rename from sepolicy/hal_gnss_qti.te rename to sepolicy/vendor/hal_gnss_qti.te diff --git a/sepolicy/hal_graphics_composer_default.te b/sepolicy/vendor/hal_graphics_composer_default.te similarity index 100% rename from sepolicy/hal_graphics_composer_default.te rename to sepolicy/vendor/hal_graphics_composer_default.te diff --git a/sepolicy/hal_ir_default.te b/sepolicy/vendor/hal_ir_default.te similarity index 100% rename from sepolicy/hal_ir_default.te rename to sepolicy/vendor/hal_ir_default.te diff --git a/sepolicy/hal_light_default.te b/sepolicy/vendor/hal_light_default.te similarity index 100% rename from sepolicy/hal_light_default.te rename to sepolicy/vendor/hal_light_default.te diff --git a/sepolicy/hal_mlipay_default.te b/sepolicy/vendor/hal_mlipay_default.te similarity index 100% rename from sepolicy/hal_mlipay_default.te rename to sepolicy/vendor/hal_mlipay_default.te diff --git a/sepolicy/hal_power_default.te b/sepolicy/vendor/hal_power_default.te similarity index 100% rename from sepolicy/hal_power_default.te rename to sepolicy/vendor/hal_power_default.te diff --git a/sepolicy/hal_sensors_default.te b/sepolicy/vendor/hal_sensors_default.te similarity index 100% rename from sepolicy/hal_sensors_default.te rename to sepolicy/vendor/hal_sensors_default.te diff --git a/sepolicy/hvdcp.te b/sepolicy/vendor/hvdcp.te similarity index 100% rename from sepolicy/hvdcp.te rename to sepolicy/vendor/hvdcp.te diff --git a/sepolicy/hwservice.te b/sepolicy/vendor/hwservice.te similarity index 100% rename from sepolicy/hwservice.te rename to sepolicy/vendor/hwservice.te diff --git a/sepolicy/hwservice_contexts b/sepolicy/vendor/hwservice_contexts similarity index 100% rename from sepolicy/hwservice_contexts rename to sepolicy/vendor/hwservice_contexts diff --git a/sepolicy/hwservicemanager.te b/sepolicy/vendor/hwservicemanager.te similarity index 100% rename from sepolicy/hwservicemanager.te rename to sepolicy/vendor/hwservicemanager.te diff --git a/sepolicy/init.te b/sepolicy/vendor/init.te similarity index 100% rename from sepolicy/init.te rename to sepolicy/vendor/init.te diff --git a/sepolicy/init_fingerprint.te b/sepolicy/vendor/init_fingerprint.te similarity index 100% rename from sepolicy/init_fingerprint.te rename to sepolicy/vendor/init_fingerprint.te diff --git a/sepolicy/kernel.te b/sepolicy/vendor/kernel.te similarity index 100% rename from sepolicy/kernel.te rename to sepolicy/vendor/kernel.te diff --git a/sepolicy/location.te b/sepolicy/vendor/location.te similarity index 100% rename from sepolicy/location.te rename to sepolicy/vendor/location.te diff --git a/sepolicy/netmgrd.te b/sepolicy/vendor/netmgrd.te similarity index 100% rename from sepolicy/netmgrd.te rename to sepolicy/vendor/netmgrd.te diff --git a/sepolicy/priv_app.te b/sepolicy/vendor/priv_app.te similarity index 100% rename from sepolicy/priv_app.te rename to sepolicy/vendor/priv_app.te diff --git a/sepolicy/property.te b/sepolicy/vendor/property.te similarity index 100% rename from sepolicy/property.te rename to sepolicy/vendor/property.te diff --git a/sepolicy/property_contexts b/sepolicy/vendor/property_contexts similarity index 100% rename from sepolicy/property_contexts rename to sepolicy/vendor/property_contexts diff --git a/sepolicy/qti_init_shell.te b/sepolicy/vendor/qti_init_shell.te similarity index 100% rename from sepolicy/qti_init_shell.te rename to sepolicy/vendor/qti_init_shell.te diff --git a/sepolicy/rild.te b/sepolicy/vendor/rild.te similarity index 100% rename from sepolicy/rild.te rename to sepolicy/vendor/rild.te diff --git a/sepolicy/system_app.te b/sepolicy/vendor/system_app.te similarity index 100% rename from sepolicy/system_app.te rename to sepolicy/vendor/system_app.te diff --git a/sepolicy/system_server.te b/sepolicy/vendor/system_server.te similarity index 100% rename from sepolicy/system_server.te rename to sepolicy/vendor/system_server.te diff --git a/sepolicy/tee.te b/sepolicy/vendor/tee.te similarity index 100% rename from sepolicy/tee.te rename to sepolicy/vendor/tee.te diff --git a/sepolicy/thermal-engine.te b/sepolicy/vendor/thermal-engine.te similarity index 100% rename from sepolicy/thermal-engine.te rename to sepolicy/vendor/thermal-engine.te diff --git a/sepolicy/vendor_init.te b/sepolicy/vendor/vendor_init.te similarity index 100% rename from sepolicy/vendor_init.te rename to sepolicy/vendor/vendor_init.te diff --git a/sepolicy/vndservice.te b/sepolicy/vendor/vndservice.te similarity index 100% rename from sepolicy/vndservice.te rename to sepolicy/vendor/vndservice.te diff --git a/sepolicy/vndservice_contexts b/sepolicy/vendor/vndservice_contexts similarity index 100% rename from sepolicy/vndservice_contexts rename to sepolicy/vendor/vndservice_contexts diff --git a/sepolicy/vndservicemanager.te b/sepolicy/vendor/vndservicemanager.te similarity index 100% rename from sepolicy/vndservicemanager.te rename to sepolicy/vendor/vndservicemanager.te