From ac1a6d440c28056f3543b6f63bd66e0537ff06f4 Mon Sep 17 00:00:00 2001
From: Alex Klyubin <klyubin@google.com>
Date: Tue, 14 Feb 2017 13:33:16 -0800
Subject: [PATCH] Move hal_*_default policy to vendor image

hal_*_default daemons whose policy is in common/device-agnostic policy
are provided by the vendor image (see vendor/file_contexts). Thus,
their policy should also reside in the vendor image, rather than in
the system image. This means their policy should live in the vendor
subdirectory of this project.

Test: Device boots and appears to work
Bug: 34135607
Bug: 34170079
Change-Id: I6613e43733e03d4a3d4726f849732d903e024016
---
 private/hal_boot.te                                         | 2 --
 public/hal_boot.te                                          | 3 ---
 {private => vendor}/hal_audio_default.te                    | 0
 vendor/hal_boot.te                                          | 6 ++++++
 {private => vendor}/hal_camera_default.te                   | 0
 {private => vendor}/hal_configstore_default.te              | 0
 {private => vendor}/hal_contexthub_default.te               | 0
 {private => vendor}/hal_drm_default.te                      | 0
 {private => vendor}/hal_dumpstate_default.te                | 0
 {private => vendor}/hal_fingerprint_default.te              | 0
 {private => vendor}/hal_gatekeeper_default.te               | 0
 {private => vendor}/hal_gnss_default.te                     | 0
 {private => vendor}/hal_graphics_allocator_default.te       | 0
 {private => vendor}/hal_health_default.te                   | 0
 {private => vendor}/hal_ir_default.te                       | 0
 private/hal_keymaster.te => vendor/hal_keymaster_default.te | 0
 {private => vendor}/hal_light_default.te                    | 0
 {private => vendor}/hal_memtrack_default.te                 | 0
 {private => vendor}/hal_nfc_default.te                      | 0
 {private => vendor}/hal_power_default.te                    | 0
 {private => vendor}/hal_sensors_default.te                  | 0
 {private => vendor}/hal_thermal_default.te                  | 0
 {private => vendor}/hal_usb_default.te                      | 0
 {private => vendor}/hal_vibrator_default.te                 | 0
 {private => vendor}/hal_vr_default.te                       | 0
 {private => vendor}/hal_wifi_default.te                     | 0
 26 files changed, 6 insertions(+), 5 deletions(-)
 delete mode 100644 private/hal_boot.te
 rename {private => vendor}/hal_audio_default.te (100%)
 create mode 100644 vendor/hal_boot.te
 rename {private => vendor}/hal_camera_default.te (100%)
 rename {private => vendor}/hal_configstore_default.te (100%)
 rename {private => vendor}/hal_contexthub_default.te (100%)
 rename {private => vendor}/hal_drm_default.te (100%)
 rename {private => vendor}/hal_dumpstate_default.te (100%)
 rename {private => vendor}/hal_fingerprint_default.te (100%)
 rename {private => vendor}/hal_gatekeeper_default.te (100%)
 rename {private => vendor}/hal_gnss_default.te (100%)
 rename {private => vendor}/hal_graphics_allocator_default.te (100%)
 rename {private => vendor}/hal_health_default.te (100%)
 rename {private => vendor}/hal_ir_default.te (100%)
 rename private/hal_keymaster.te => vendor/hal_keymaster_default.te (100%)
 rename {private => vendor}/hal_light_default.te (100%)
 rename {private => vendor}/hal_memtrack_default.te (100%)
 rename {private => vendor}/hal_nfc_default.te (100%)
 rename {private => vendor}/hal_power_default.te (100%)
 rename {private => vendor}/hal_sensors_default.te (100%)
 rename {private => vendor}/hal_thermal_default.te (100%)
 rename {private => vendor}/hal_usb_default.te (100%)
 rename {private => vendor}/hal_vibrator_default.te (100%)
 rename {private => vendor}/hal_vr_default.te (100%)
 rename {private => vendor}/hal_wifi_default.te (100%)

diff --git a/private/hal_boot.te b/private/hal_boot.te
deleted file mode 100644
index 1307afdfa..000000000
--- a/private/hal_boot.te
+++ /dev/null
@@ -1,2 +0,0 @@
-# may be started by init
-init_daemon_domain(hal_boot)
diff --git a/public/hal_boot.te b/public/hal_boot.te
index 4e7ba9e9e..870f1e4d7 100644
--- a/public/hal_boot.te
+++ b/public/hal_boot.te
@@ -1,8 +1,5 @@
 # boot_control subsystem
 type hal_boot, domain, boot_control_hal;
-hal_impl_domain(hal_boot)
-
-type hal_boot_exec, exec_type, file_type;
 
 # call into system_server process (callbacks)
 binder_call(hal_boot, system_server)
diff --git a/private/hal_audio_default.te b/vendor/hal_audio_default.te
similarity index 100%
rename from private/hal_audio_default.te
rename to vendor/hal_audio_default.te
diff --git a/vendor/hal_boot.te b/vendor/hal_boot.te
new file mode 100644
index 000000000..666eacdbf
--- /dev/null
+++ b/vendor/hal_boot.te
@@ -0,0 +1,6 @@
+# boot_control subsystem
+
+hal_impl_domain(hal_boot)
+
+type hal_boot_exec, exec_type, file_type;
+init_daemon_domain(hal_boot)
diff --git a/private/hal_camera_default.te b/vendor/hal_camera_default.te
similarity index 100%
rename from private/hal_camera_default.te
rename to vendor/hal_camera_default.te
diff --git a/private/hal_configstore_default.te b/vendor/hal_configstore_default.te
similarity index 100%
rename from private/hal_configstore_default.te
rename to vendor/hal_configstore_default.te
diff --git a/private/hal_contexthub_default.te b/vendor/hal_contexthub_default.te
similarity index 100%
rename from private/hal_contexthub_default.te
rename to vendor/hal_contexthub_default.te
diff --git a/private/hal_drm_default.te b/vendor/hal_drm_default.te
similarity index 100%
rename from private/hal_drm_default.te
rename to vendor/hal_drm_default.te
diff --git a/private/hal_dumpstate_default.te b/vendor/hal_dumpstate_default.te
similarity index 100%
rename from private/hal_dumpstate_default.te
rename to vendor/hal_dumpstate_default.te
diff --git a/private/hal_fingerprint_default.te b/vendor/hal_fingerprint_default.te
similarity index 100%
rename from private/hal_fingerprint_default.te
rename to vendor/hal_fingerprint_default.te
diff --git a/private/hal_gatekeeper_default.te b/vendor/hal_gatekeeper_default.te
similarity index 100%
rename from private/hal_gatekeeper_default.te
rename to vendor/hal_gatekeeper_default.te
diff --git a/private/hal_gnss_default.te b/vendor/hal_gnss_default.te
similarity index 100%
rename from private/hal_gnss_default.te
rename to vendor/hal_gnss_default.te
diff --git a/private/hal_graphics_allocator_default.te b/vendor/hal_graphics_allocator_default.te
similarity index 100%
rename from private/hal_graphics_allocator_default.te
rename to vendor/hal_graphics_allocator_default.te
diff --git a/private/hal_health_default.te b/vendor/hal_health_default.te
similarity index 100%
rename from private/hal_health_default.te
rename to vendor/hal_health_default.te
diff --git a/private/hal_ir_default.te b/vendor/hal_ir_default.te
similarity index 100%
rename from private/hal_ir_default.te
rename to vendor/hal_ir_default.te
diff --git a/private/hal_keymaster.te b/vendor/hal_keymaster_default.te
similarity index 100%
rename from private/hal_keymaster.te
rename to vendor/hal_keymaster_default.te
diff --git a/private/hal_light_default.te b/vendor/hal_light_default.te
similarity index 100%
rename from private/hal_light_default.te
rename to vendor/hal_light_default.te
diff --git a/private/hal_memtrack_default.te b/vendor/hal_memtrack_default.te
similarity index 100%
rename from private/hal_memtrack_default.te
rename to vendor/hal_memtrack_default.te
diff --git a/private/hal_nfc_default.te b/vendor/hal_nfc_default.te
similarity index 100%
rename from private/hal_nfc_default.te
rename to vendor/hal_nfc_default.te
diff --git a/private/hal_power_default.te b/vendor/hal_power_default.te
similarity index 100%
rename from private/hal_power_default.te
rename to vendor/hal_power_default.te
diff --git a/private/hal_sensors_default.te b/vendor/hal_sensors_default.te
similarity index 100%
rename from private/hal_sensors_default.te
rename to vendor/hal_sensors_default.te
diff --git a/private/hal_thermal_default.te b/vendor/hal_thermal_default.te
similarity index 100%
rename from private/hal_thermal_default.te
rename to vendor/hal_thermal_default.te
diff --git a/private/hal_usb_default.te b/vendor/hal_usb_default.te
similarity index 100%
rename from private/hal_usb_default.te
rename to vendor/hal_usb_default.te
diff --git a/private/hal_vibrator_default.te b/vendor/hal_vibrator_default.te
similarity index 100%
rename from private/hal_vibrator_default.te
rename to vendor/hal_vibrator_default.te
diff --git a/private/hal_vr_default.te b/vendor/hal_vr_default.te
similarity index 100%
rename from private/hal_vr_default.te
rename to vendor/hal_vr_default.te
diff --git a/private/hal_wifi_default.te b/vendor/hal_wifi_default.te
similarity index 100%
rename from private/hal_wifi_default.te
rename to vendor/hal_wifi_default.te
-- 
GitLab