From 98fbd09d7d15d7987b85ff9fc88943b5e23ee62c Mon Sep 17 00:00:00 2001
From: LuK1337 <priv.luk@gmail.com>
Date: Thu, 2 Apr 2020 23:24:45 +0200
Subject: [PATCH] sdm845-common: Relocate dashd to /system/bin

Change-Id: Ief585959ebef9461bd62b26039997ae3c438c1d5
---
 proprietary-files.txt          | 2 +-
 rootdir/etc/init.qcom.rc       | 3 +--
 sepolicy/private/dashd.te      | 2 ++
 sepolicy/private/file_contexts | 3 +++
 4 files changed, 7 insertions(+), 3 deletions(-)
 create mode 100644 sepolicy/private/dashd.te

diff --git a/proprietary-files.txt b/proprietary-files.txt
index db17f2b..2393217 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -9,7 +9,7 @@ product/lib64/libaptX_encoder.so|df1c89d7af1bb35808d5fe3496b04ba066c10cbc
 product/lib64/libaptXHD_encoder.so|e13fa70c97caaa24d061678bdee608eb8850a69e
 
 # DASH
--sbin/dashd;rootfs
+sbin/dashd:bin/dashd
 
 # DPM
 framework/tcmclient.jar
diff --git a/rootdir/etc/init.qcom.rc b/rootdir/etc/init.qcom.rc
index 8917d6b..c0de072 100644
--- a/rootdir/etc/init.qcom.rc
+++ b/rootdir/etc/init.qcom.rc
@@ -11,10 +11,9 @@ on charger
 service cvphalservice /system/bin/true
     disabled
 
-service dashd /sbin/dashd
+service dashd /system/bin/dashd
     class core
     critical
-    seclabel u:r:dashd:s0
     group root system
 
 service factory-hal-1-0 /system/bin/true
diff --git a/sepolicy/private/dashd.te b/sepolicy/private/dashd.te
new file mode 100644
index 0000000..610a0c6
--- /dev/null
+++ b/sepolicy/private/dashd.te
@@ -0,0 +1,2 @@
+type dashd, coredomain, domain;
+type dashd_exec, exec_type, system_file_type, file_type;
diff --git a/sepolicy/private/file_contexts b/sepolicy/private/file_contexts
index b7225ad..b8bb723 100644
--- a/sepolicy/private/file_contexts
+++ b/sepolicy/private/file_contexts
@@ -15,6 +15,9 @@
 /system/bin/hw/lineage\.livedisplay@2\.0-service\.oneplus_sdm845    u:object_r:hal_livedisplay_sdm845_exec:s0
 /system/bin/hw/lineage\.touch@1\.0-service\.oneplus_sdm845    u:object_r:hal_touch_sdm845_exec:s0
 
+# DASH
+/system/bin/dashd    u:object_r:dashd_exec:s0
+
 # tri-state-key
 /system/bin/tri-state-key_daemon          u:object_r:tri-state-key_daemon_exec:s0