From 61038e8f6fef17070fc5e1e8d7f0ed27feb414db Mon Sep 17 00:00:00 2001
From: therootlord <igor_cestari@hotmail.com>
Date: Sun, 16 Dec 2018 16:22:50 -0200
Subject: [PATCH] sanders: update ACDB props and init.qcom.rc

---
 rootdir/etc/init.qcom.rc | 17 ++++-------------
 vendor_prop.mk           | 14 +++++++-------
 2 files changed, 11 insertions(+), 20 deletions(-)

diff --git a/rootdir/etc/init.qcom.rc b/rootdir/etc/init.qcom.rc
index 1d4f7af..3af6c19 100644
--- a/rootdir/etc/init.qcom.rc
+++ b/rootdir/etc/init.qcom.rc
@@ -417,14 +417,11 @@ on post-fs-data
     chown system system /data/dpm/nsrm
 
     # Create directory used by audio subsystem
-    mkdir /data/vendor/misc/audio 0770 audio audio
+    mkdir /data/vendor/audio 0770 audio audio
 
     # Create directory for audio delta files
-    mkdir /data/vendor/misc/audio/acdbdata 0770 media audio
-    mkdir /data/vendor/misc/audio/acdbdata/delta 0770 media audio
-
-    # Create directory used by the DASH client
-    mkdir /data/misc/dash 0770 media audio
+    mkdir /data/vendor/audio/acdbdata 0770 media audio
+    mkdir /data/vendor/audio/acdbdata/delta 0770 media audio
 
     # Mounting of persist is moved to 'on emmc-fs' and 'on fs' sections
     # We chown/chmod /persist again so because mount is run as root + defaults
@@ -473,14 +470,8 @@ on post-fs-data
     # Create /data/vendor/time folder for time-services
     mkdir /data/vendor/time/ 0700 system system
 
-    mkdir /data/vendor/audio/ 0770 media audio
-
-    # Create a folder for audio delta files
-    mkdir /data/vendor/audio/acdbdata 0770 media audio
-    mkdir /data/vendor/audio/acdbdata/delta 0770 media audio
-
     #Create a folder for SRS to be able to create a usercfg file
-    mkdir /data/data/media 0770 media media
+    #mkdir /data/data/media 0770 media media
 
     #Create FM dir for patchdownloader
     mkdir /data/misc/fm 0770 system system
diff --git a/vendor_prop.mk b/vendor_prop.mk
index 46dc976..f591e35 100644
--- a/vendor_prop.mk
+++ b/vendor_prop.mk
@@ -12,15 +12,15 @@ PRODUCT_PROPERTY_OVERRIDES += \
     av.offload.enable=false \
     av.debug.disable.pers.cache=1 \
     qcom.hw.aac.encoder=false \
-    persist.audio.calfile0=/vendor/etc/acdbdata/Bluetooth_cal.acdb \
-    persist.audio.calfile1=/vendor/etc/acdbdata/General_cal.acdb \
-    persist.audio.calfile2=/vendor/etc/acdbdata/Global_cal.acdb \
-    persist.audio.calfile3=/vendor/etc/acdbdata/Handset_cal.acdb \
-    persist.audio.calfile4=/vendor/etc/acdbdata/Hdmi_cal.acdb \
-    persist.audio.calfile5=/vendor/etc/acdbdata/Headset_cal.acdb \
-    persist.audio.calfile6=/vendor/etc/acdbdata/Speaker_cal.acdb \
     persist.audio.dualmic.config=endfire \
     persist.audio.endcall.delay=250 \
+    persist.vendor.audio.calfile0=/vendor/etc/acdbdata/Bluetooth_cal.acdb \
+    persist.vendor.audio.calfile1=/vendor/etc/acdbdata/General_cal.acdb \
+    persist.vendor.audio.calfile2=/vendor/etc/acdbdata/Global_cal.acdb \
+    persist.vendor.audio.calfile3=/vendor/etc/acdbdata/Handset_cal.acdb \
+    persist.vendor.audio.calfile4=/vendor/etc/acdbdata/Hdmi_cal.acdb \
+    persist.vendor.audio.calfile5=/vendor/etc/acdbdata/Headset_cal.acdb \
+    persist.vendor.audio.calfile6=/vendor/etc/acdbdata/Speaker_cal.acdb \
     persist.vendor.audio.fluence.speaker=false \
     persist.vendor.audio.fluence.voicecall=true \
     persist.vendor.audio.fluence.voicecomm=true \