init.juno.rc: move sdcard symbol link creation into to post-fsRLCR-16.01RLCR-15.12

otherwise the /storage/sdcard0 symbol link will not be create
since the /storage is mount in the post-fs section in init.rc
And remove the overlay of storage_list.xml file

Change-Id: Iaeeef126eea745de62d97a8a16bf63aa69b106bc
Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>

2 files changed, 6 insertions, 44 deletions

diff --git a/init.juno.rc b/init.juno.rc
index e4e59b0..8116cf3 100644
--- a/init.juno.rc
+++ b/init.juno.rc
@@ -5,8 +5,6 @@ on init
 on init
     # disable transparent huge pages
     write /sys/kernel/mm/transparent_hugepage/enabled "never"
-    symlink /sdcard /mnt/sdcard
-    symlink /sdcard /storage/sdcard0
 
 on fs
     mount_all /fstab.juno
@@ -24,6 +22,12 @@ on post-fs
     chmod 0666 /dev/mali0
     chmod 0666 /dev/graphics/fb0
 
+    # For legacy support
+    # See storage config details at http://source.android.com/tech/storage/
+    # since /storage is mounted on post-fs in init.rc
+    symlink /sdcard /mnt/sdcard
+    symlink /sdcard /storage/sdcard0
+
 on boot
 
     setprop ARGH ARGH
diff --git a/overlay/frameworks/base/core/res/res/xml/storage_list.xml b/overlay/frameworks/base/core/res/res/xml/storage_list.xml
deleted file mode 100644
index b80fa97..0000000
--- a/overlay/frameworks/base/core/res/res/xml/storage_list.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-**
-** Copyright 2011, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License")
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<!-- The <device> element should contain one or more <storage> elements.
-     Exactly one of these should have the attribute primary="true".
-     This storage will be the primary external storage and should have path="/mnt/sdcard".
-     Each storage should have both a path and description attribute set.
-     The following boolean attributes are optional:
-
-        primary:    this storage is the primary external storage
-        removable:  this is removable storage (for example, a real SD card)
-        emulated:   the storage is emulated via the FUSE sdcard daemon
-        mtp-reserve: number of megabytes of storage MTP should reserve for free storage
-                     (used for emulated storage that is shared with system's data partition)
-
-      A storage should not have both emulated and removable set to true
--->
-
-<StorageList xmlns:android="http://schemas.android.com/apk/res/android">
-<storage
-    android:mountPoint="/storage/sdcard0"
-    android:storageDescription="@string/storage_internal"
-    android:primary="true"
-    android:emulated="true"
-    android:mtpReserve="100" />
-</StorageList>