summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAmit Pundir <amit.pundir@linaro.org>2018-09-07 14:35:06 +0530
committerAmit Pundir <amit.pundir@linaro.org>2018-11-01 15:33:28 +0000
commit3a6f6bedb0151c1f5f41a5268ebe3891f09bda1d (patch)
treedb97668b6ce6df9d7bbaa64787baff8189dc816b
parent802ccb15cd1acc2e4d45f36f32ca13a4bf82959c (diff)
downloaddragonboard410c-3a6f6bedb0151c1f5f41a5268ebe3891f09bda1d.tar.gz
Revert "db820c: Build Audio HAL and configure HDMI out mixer"
This reverts commit 6c82e1548afde519e57fb7be18526f95f84587cd. We don't plan to use tinymix utility to set mixer controls anymore. It is not Treble compatible either. We plan to hardcode the mixer controls in the audio HAL instead. Recent AOSP sepolicy poject changes broke tinymix sepolicies as well. In short no need to spend more time fixing tinymix. Change-Id: Ia1b96ad4eacca003157e896e4a1cf26eb955d0a8 Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
-rw-r--r--db820c/device.mk5
-rw-r--r--db820c/tinymix.db820c.rc5
-rw-r--r--sepolicy/file_contexts2
-rw-r--r--sepolicy/tinymix.te7
4 files changed, 0 insertions, 19 deletions
diff --git a/db820c/device.mk b/db820c/device.mk
index 20fc9f2..b7e20b6 100644
--- a/db820c/device.mk
+++ b/db820c/device.mk
@@ -34,9 +34,4 @@ PRODUCT_COPY_FILES := \
# Build generic Power HAL
PRODUCT_PACKAGES += power.db820c
-# Build generic Audio HAL
-PRODUCT_PACKAGES += audio.primary.db820c
-PRODUCT_COPY_FILES += \
- $(LOCAL_PATH)/tinymix.db820c.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/tinymix.db820c.rc
-
$(call inherit-product, $(LOCAL_PATH)/firmware/device.mk)
diff --git a/db820c/tinymix.db820c.rc b/db820c/tinymix.db820c.rc
deleted file mode 100644
index 7831005..0000000
--- a/db820c/tinymix.db820c.rc
+++ /dev/null
@@ -1,5 +0,0 @@
-service tinymixer /system/bin/tinymix 0 1
- class core
- user shell
- group audio
- oneshot
diff --git a/sepolicy/file_contexts b/sepolicy/file_contexts
index e151827..141d646 100644
--- a/sepolicy/file_contexts
+++ b/sepolicy/file_contexts
@@ -9,8 +9,6 @@
/sys/devices/platform/soc/900000.mdss u:object_r:sysfs_mdss:s0
/sys/devices/platform/soc/1a00000.mdss u:object_r:sysfs_mdss:s0
-/system/bin/tinymix u:object_r:tinymix_exec:s0
-
/(vendor|system/vendor)/lib(64)?/hw/gralloc\.gbm\.so u:object_r:same_process_hal_file:s0
/(vendor|system/vendor)/lib(64)?/libglapi\.so u:object_r:same_process_hal_file:s0
/(vendor|system/vendor)/lib(64)?/libdrm\.so u:object_r:same_process_hal_file:s0
diff --git a/sepolicy/tinymix.te b/sepolicy/tinymix.te
deleted file mode 100644
index 6e7ef54..0000000
--- a/sepolicy/tinymix.te
+++ /dev/null
@@ -1,7 +0,0 @@
-type tinymix, domain;
-type tinymix_exec, exec_type, file_type;
-
-init_daemon_domain(tinymix)
-
-allow tinymix audio_device:chr_file { ioctl open read write };
-allow tinymix audio_device:dir search;