Merge "Revert "Mako: Fix sdcard permissions for native apps."" into jb-mr2-dev
diff --git a/init.mako.rc b/init.mako.rc
index 2e4ef14..0c77562 100644
--- a/init.mako.rc
+++ b/init.mako.rc
@@ -23,7 +23,6 @@
# See storage config details at http://source.android.com/tech/storage/
mkdir /mnt/shell/emulated 0700 shell shell
mkdir /storage/emulated 0555 root root
- mkdir /storage/emulated/legacy 0555 root root
# Set permissions for persist partition
mkdir /persist 0771 system system
@@ -37,6 +36,7 @@
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
# Setup custom emergency number list based on
# the MCC. This is needed by RIL.
@@ -374,11 +374,6 @@
service sdcard /system/bin/sdcard /data/media /mnt/shell/emulated 1023 1023
class late_start
-# Binding fuse mount point to /storage/emulated/legacy
- on property:init.svc.sdcard=running
- wait /mnt/shell/emulated/0
- mount none /mnt/shell/emulated/0 /storage/emulated/legacy bind
-
service thermald /system/bin/thermald
class main