Updated external storage configuration.

vold now manages external storage in a much more dynamic fashion,
so we no longer need to define FUSE daemons or mount points.

Bug: 19993667
Change-Id: I144fc2cd620fe7ef848fa835def247070a201e80

1 files changed, 2 insertions, 19 deletions

diff --git a/init.deb.rc b/init.deb.rc
index 65cf477..8879698 100644
--- a/init.deb.rc
+++ b/init.deb.rc
@@ -23,19 +23,9 @@ on early-init
     symlink /data/tombstones /tombstones
 
 on init
-    # See storage config details at http://source.android.com/tech/storage/
-    mkdir /mnt/shell/emulated 0700 shell shell
-    mkdir /storage/emulated 0555 root root
-
-    export EXTERNAL_STORAGE /storage/emulated/legacy
-    export EMULATED_STORAGE_SOURCE /mnt/shell/emulated
-    export EMULATED_STORAGE_TARGET /storage/emulated
-
     # Support legacy paths
-    symlink /storage/emulated/legacy /sdcard
-    symlink /storage/emulated/legacy /mnt/sdcard
-    symlink /storage/emulated/legacy /storage/sdcard0
-    symlink /mnt/shell/emulated/0 /storage/emulated/legacy
+    symlink /sdcard /mnt/sdcard
+    symlink /sdcard /storage/sdcard0
 
 on init
     # Set permissions for persist partition
@@ -45,7 +35,6 @@ on init
 on fs
     mount_all ./fstab.flo
     restorecon_recursive /persist
-    setprop ro.crypto.fuse_sdcard true
     write /sys/kernel/boot_adsp/boot 1
 
 on early-boot
@@ -129,8 +118,6 @@ on boot
 
 # msm specific files that need to be created on /data
 on post-fs-data
-    mkdir /data/media 0770 media_rw media_rw
-
     chown system system /dev/wcnss_wlan
     write /sys/module/wcnss_ssr_8960/parameters/enable_riva_ssr 1
 
@@ -416,10 +403,6 @@ service charger /sbin/healthd -c
     critical
     seclabel u:r:healthd:s0
 
-# virtual sdcard daemon running as media_rw (1023)
-service sdcard /system/bin/sdcard -u 1023 -g 1023 -l /data/media /mnt/shell/emulated
-    class late_start
-
 service thermald /system/bin/thermald
     class main
     group radio