rearrange external sdcard support as per 4.3 changes
Change-Id: Ib9c1d005341684b957d385923762b509a8ac4edd
Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
diff --git a/device.mk b/device.mk
index 0093b9e..a811996 100644
--- a/device.mk
+++ b/device.mk
@@ -1,5 +1,5 @@
PRODUCT_COPY_FILES := \
- device/linaro/common/fstab.partitions:root/fstab.arm-versatileexpress \
+ device/linaro/vexpress/fstab.arm-versatileexpress:root/fstab.arm-versatileexpress \
device/linaro/vexpress/fstab.arm-versatileexpress-usb:root/fstab.arm-versatileexpress-usb \
device/linaro/common/fstab.partitions:root/fstab.v2p-aarch64 \
device/linaro/vexpress/vold.fstab:system/etc/vold.fstab \
diff --git a/fstab.arm-versatileexpress b/fstab.arm-versatileexpress
new file mode 100644
index 0000000..ae17554
--- /dev/null
+++ b/fstab.arm-versatileexpress
@@ -0,0 +1,10 @@
+# Android fstab file.
+#<src> <mnt_point> <type> <mnt_flags and options> <fs_mgr_flags>
+# The filesystem that contains the filesystem checker binary (typically /system) cannot
+# specify MF_CHECK, and must come before any filesystems that do specify MF_CHECK
+
+
+/dev/block/mmcblk0p2 /system ext4 ro wait
+/dev/block/mmcblk0p3 /cache ext4 noatime,nosuid,nodev,nomblk_io_submit,errors=panic wait
+/dev/block/mmcblk0p5 /data ext4 noatime,nosuid,nodev,nomblk_io_submit,errors=panic wait
+/dev/block/mmcblk0p6 /mnt/sdcard vfat defaults voldmanaged=sdcard:auto
diff --git a/fstab.arm-versatileexpress-usb b/fstab.arm-versatileexpress-usb
index 2777841..0102ef9 100644
--- a/fstab.arm-versatileexpress-usb
+++ b/fstab.arm-versatileexpress-usb
@@ -7,3 +7,4 @@
/dev/block/sda2 /system ext4 ro wait
/dev/block/sda3 /cache ext4 noatime,nosuid,nodev,nomblk_io_submit,errors=panic wait
/dev/block/sda5 /data ext4 noatime,nosuid,nodev,nomblk_io_submit,errors=panic wait
+/dev/block/sda6 /mnt/sdcard vfat defaults voldmanaged=sdcard:auto
diff --git a/overlay/frameworks/base/core/res/res/xml/storage_list.xml b/overlay/frameworks/base/core/res/res/xml/storage_list.xml
index 4df343c..e0d7b6b 100644
--- a/overlay/frameworks/base/core/res/res/xml/storage_list.xml
+++ b/overlay/frameworks/base/core/res/res/xml/storage_list.xml
@@ -34,7 +34,7 @@
<StorageList xmlns:android="http://schemas.android.com/apk/res/android">
<storage android:mountPoint="/mnt/sdcard"
- android:storageDescription="@string/storage_internal"
+ android:storageDescription="@string/storage_sd_card"
android:primary="true"
android:removable="true" />
</StorageList>