From 260468a75f9d80b568a3f46e6e7f5ad61937b84d Mon Sep 17 00:00:00 2001
From: RomanDesigner <romashkarus08@gmail.com>
Date: Sun, 5 Jan 2020 12:48:03 +0300
Subject: [PATCH] msm8226-common: Define extra folders in makefile instead of
 init.qcom.rc

With Android 10, these folders get wiped out unless declared at compile time.
---
 BoardConfigCommon.mk     |  6 ++++++
 config.fs                | 24 ++++++++++++++++++++++++
 rootdir/etc/init.qcom.rc |  9 ---------
 3 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index 39783e3..551d893 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -81,7 +81,13 @@ MAX_EGL_CACHE_KEY_SIZE := 12*1024
 MAX_EGL_CACHE_SIZE := 2048*1024
 
 # Filesystem
+BOARD_ROOT_EXTRA_SYMLINKS := /data/tombstones:/tombstones
 TARGET_FS_CONFIG_GEN := device/samsung/msm8226-common/config.fs
+BOARD_ROOT_EXTRA_FOLDERS := \
+    firmware-modem \
+    firmware \
+    efs \
+    persist
 
 # HIDL
 DEVICE_MANIFEST_FILE := device/samsung/msm8226-common/manifest.xml
diff --git a/config.fs b/config.fs
index bc0e10b..9b13038 100644
--- a/config.fs
+++ b/config.fs
@@ -6,3 +6,27 @@ value:2951
 
 [AID_VENDOR_RFS_SHARED]
 value:2952
+
+[efs/]
+mode: 0771
+user: AID_SYSTEM
+group: AID_RADIO
+caps: 0
+
+[firmware/]
+mode: 0771
+user: AID_SYSTEM
+group: AID_SYSTEM
+caps: 0
+
+[firmware-modem/]
+mode: 0771
+user: AID_SYSTEM
+group: AID_SYSTEM
+caps: 0
+
+[persist/]
+mode: 0771
+user: AID_SYSTEM
+group: AID_SYSTEM
+caps: 0
diff --git a/rootdir/etc/init.qcom.rc b/rootdir/etc/init.qcom.rc
index b1f2c98..29f2dd5 100644
--- a/rootdir/etc/init.qcom.rc
+++ b/rootdir/etc/init.qcom.rc
@@ -40,15 +40,6 @@ on early-init
 
     write /sys/block/zram0/comp_algorithm lz4    
 
-    mkdir /firmware 0771 system system
-    mkdir /firmware-modem 0771 system system
-
-    mkdir /persist 0771 system system
-
-    mkdir /efs 0771 system radio
-
-    symlink /data/tombstones /tombstones
-
     # Set permissions so radio can read
     chmod 0444 /proc/cmdline