From e42554da1d5f9c0397a43bc2afc08c09a0f60a38 Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Fri, 1 Mar 2019 00:01:52 +0100
Subject: [PATCH] Still detect moto on pie. Separate sound changes between pie
 vendor and previous

---
 rw-system.sh | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/rw-system.sh b/rw-system.sh
index 7858edc..2e242c6 100644
--- a/rw-system.sh
+++ b/rw-system.sh
@@ -175,12 +175,24 @@ if getprop ro.vendor.build.fingerprint |grep -iq \
     mount -o bind /mnt/phh/empty_dir /vendor/lib/soundfx
 fi
 
-if [ "$(getprop ro.vendor.product.manufacturer)" == "motorola" ];then
+if [ "$(getprop ro.vendor.product.manufacturer)" = "motorola" ] || [ "$(getprop ro.product.vendor.manufacturer)" = "motorola" ];then
     if getprop ro.vendor.product.device |grep -q -e nora -e ali -e hannah -e evert -e jeter;then
+        if [ "$vndk" -ge 28 ];then
+            f="/vendor/lib/libeffects.so"
+            # shellcheck disable=SC2010
+            ctxt="$(ls -lZ $f |grep -oE 'u:object_r:[^:]*:s0')"
+            b="$(echo "$f"|tr / _)"
 
-
-        mount -o bind /mnt/phh/empty_dir /vendor/lib64/soundfx
-        mount -o bind /mnt/phh/empty_dir /vendor/lib/soundfx
+            cp -a $f "/mnt/phh/$b"
+            sed -i \
+                's/%zu errors during loading of configuration: %s/%zu errors during loading of configuration: ss/g' \
+                "/mnt/phh/$b"
+            chcon "$ctxt" "/mnt/phh/$b"
+            mount -o bind "/mnt/phh/$b" $f
+        else
+            mount -o bind /mnt/phh/empty_dir /vendor/lib64/soundfx
+            mount -o bind /mnt/phh/empty_dir /vendor/lib/soundfx
+        fi
     fi
 fi