modularize aocdump
Bug: 197585437
Test: build ROM with aocdump labeled correctly
Change-Id: Ia2c2877a337bca6711d0f15a309b9012624ce76b
diff --git a/legacy/aocdump.te b/aoc/aocdump.te
similarity index 75%
rename from legacy/aocdump.te
rename to aoc/aocdump.te
index ca468a3..9091142 100644
--- a/legacy/aocdump.te
+++ b/aoc/aocdump.te
@@ -6,14 +6,11 @@
# Permit communication with AoC
allow aocdump aoc_device:chr_file rw_file_perms;
- allow aocdump radio_vendor_data_file:dir rw_dir_perms;
- allow aocdump radio_vendor_data_file:file create_file_perms;
allow aocdump wifi_logging_data_file:dir create_dir_perms;
allow aocdump wifi_logging_data_file:file create_file_perms;
set_prop(aocdump, vendor_audio_prop);
r_dir_file(aocdump, proc_asound)
allow aocdump self:unix_stream_socket create_stream_socket_perms;
- allow aocdump property_socket:sock_file { write };
allow aocdump audio_vendor_data_file:sock_file { create unlink };
')
diff --git a/aoc/file.te b/aoc/file.te
index 67f3e94..5d7031c 100644
--- a/aoc/file.te
+++ b/aoc/file.te
@@ -6,3 +6,6 @@
# persist
type persist_aoc_file, file_type, vendor_persist_type;
+
+# data
+type audio_vendor_data_file, file_type, data_file_type;
diff --git a/aoc/file_contexts b/aoc/file_contexts
index 6a4dea3..da9ab4c 100644
--- a/aoc/file_contexts
+++ b/aoc/file_contexts
@@ -19,6 +19,10 @@
# AoC vendor binaries
/vendor/bin/aocd u:object_r:aocd_exec:s0
+/vendor/bin/aocdump u:object_r:aocdump_exec:s0
# Aoc persist files
/mnt/vendor/persist/aoc(/.*)? u:object_r:persist_aoc_file:s0
+
+# Audio data files
+/data/vendor/audio(/.*)? u:object_r:audio_vendor_data_file:s0
diff --git a/aoc/property.te b/aoc/property.te
index e6f9ddb..d38e3ec 100644
--- a/aoc/property.te
+++ b/aoc/property.te
@@ -1,2 +1,4 @@
# AoC
vendor_internal_prop(vendor_aoc_prop)
+# Audio
+vendor_internal_prop(vendor_audio_prop)
diff --git a/aoc/property_contexts b/aoc/property_contexts
index 0838873..cf460c2 100644
--- a/aoc/property_contexts
+++ b/aoc/property_contexts
@@ -1,2 +1,10 @@
# AoC
vendor.aoc.firmware.version u:object_r:vendor_aoc_prop:s0
+
+# for audio
+vendor.audio_hal.period_multiplier u:object_r:vendor_audio_prop:s0
+vendor.audiodump.enable u:object_r:vendor_audio_prop:s0
+persist.vendor.audio. u:object_r:vendor_audio_prop:s0
+vendor.audiodump.log.ondemand u:object_r:vendor_audio_prop:s0
+vendor.audiodump.log.config u:object_r:vendor_audio_prop:s0
+vendor.audiodump.output.dir u:object_r:vendor_audio_prop:s0
diff --git a/legacy/file.te b/legacy/file.te
index 72311d9..777f6a3 100644
--- a/legacy/file.te
+++ b/legacy/file.te
@@ -85,7 +85,6 @@
# Audio
type persist_audio_file, file_type, vendor_persist_type;
-type audio_vendor_data_file, file_type, data_file_type;
type aoc_audio_file, file_type, vendor_file_type;
# RILD
diff --git a/legacy/file_contexts b/legacy/file_contexts
index 9adb249..21994bb 100644
--- a/legacy/file_contexts
+++ b/legacy/file_contexts
@@ -226,9 +226,6 @@
/vendor/bin/tcpdump_logger u:object_r:tcpdump_logger_exec:s0
/data/vendor/tcpdump_logger(/.*)? u:object_r:tcpdump_vendor_data_file:s0
-# Audio logging
-/vendor/bin/aocdump u:object_r:aocdump_exec:s0
-
# modem_svc_sit files
/vendor/bin/modem_svc_sit u:object_r:modem_svc_sit_exec:s0
/data/vendor/modem_stat/debug\.txt u:object_r:modem_stat_data_file:s0
@@ -265,7 +262,6 @@
# Audio
/mnt/vendor/persist/audio(/.*)? u:object_r:persist_audio_file:s0
-/data/vendor/audio(/.*)? u:object_r:audio_vendor_data_file:s0
/vendor/etc/aoc(/.*)? u:object_r:aoc_audio_file:s0
/dev/amcs u:object_r:amcs_device:s0
diff --git a/legacy/property.te b/legacy/property.te
index ff40878..4a7c01c 100644
--- a/legacy/property.te
+++ b/legacy/property.te
@@ -11,7 +11,6 @@
vendor_internal_prop(vendor_sys_default_prop)
vendor_internal_prop(vendor_ro_sys_default_prop)
vendor_internal_prop(vendor_persist_sys_default_prop)
-vendor_internal_prop(vendor_audio_prop)
vendor_internal_prop(vendor_codec2_debug_prop)
vendor_internal_prop(vendor_display_prop)
vendor_internal_prop(vendor_camera_prop)
diff --git a/legacy/property_contexts b/legacy/property_contexts
index d0da2cc..ba12f0e 100644
--- a/legacy/property_contexts
+++ b/legacy/property_contexts
@@ -31,16 +31,6 @@
ro.vendor.sys. u:object_r:vendor_ro_sys_default_prop:s0
persist.vendor.sys. u:object_r:vendor_persist_sys_default_prop:s0
-
-# for audio
-vendor.audio_hal.period_multiplier u:object_r:vendor_audio_prop:s0
-vendor.audiodump.enable u:object_r:vendor_audio_prop:s0
-persist.vendor.audio. u:object_r:vendor_audio_prop:s0
-vendor.audiodump.log.ondemand u:object_r:vendor_audio_prop:s0
-vendor.audiodump.log.config u:object_r:vendor_audio_prop:s0
-vendor.audiodump.output.dir u:object_r:vendor_audio_prop:s0
-
-
# for display
ro.vendor.hwc.drm.device u:object_r:vendor_display_prop:s0
