Use actual sdcard for EXTERNAL_STORAGE
Change-Id: I495ce2fae177b1a0e39da4e4cd16a7bf7dbd0b6a
diff --git a/device.mk b/device.mk
index 15c9a43..2737722 100644
--- a/device.mk
+++ b/device.mk
@@ -13,8 +13,7 @@
# limitations under the License.
PRODUCT_COPY_FILES := \
- device/linaro/common/init.partitions.rc:root/init.partitions.rc \
- device/linaro/common/fstab.partitions:root/fstab.partitions \
+ device/linaro/common/fstab.partitions:root/fstab.omap4pandaboard \
device/linaro/pandaboard/init.omap4pandaboard.rc:root/init.omap4pandaboard.rc \
device/linaro/pandaboard/init.omap4pandaboard.usb.rc:root/init.omap4pandaboard.usb.rc \
device/linaro/pandaboard/ueventd.omap4pandaboard.rc:root/ueventd.omap4pandaboard.rc \
diff --git a/init.omap4pandaboard.rc b/init.omap4pandaboard.rc
index 637005c..9d25da1 100644
--- a/init.omap4pandaboard.rc
+++ b/init.omap4pandaboard.rc
@@ -1,9 +1,15 @@
import init.omap4pandaboard.usb.rc
on early-init
+ export EXTERNAL_STORAGE /mnt/sdcard
+ mkdir /storage 0050 system sdcard_r
+ # for backwards compatibility
+ symlink /mnt/sdcard /storage/sdcard0
+
# mount debugfs
mount debugfs /sys/kernel/debug /sys/kernel/debug
+on init
# power management
# Enable off mode by default
#write /sys/kernel/debug/pm_debug/enable_off_mode 1
@@ -13,11 +19,17 @@
write /sys/kernel/debug/pm_debug/smartreflex/sr_iva/autocomp 1
write /sys/kernel/debug/pm_debug/smartreflex/sr_mpu/autocomp 1
+on post-fs-data
+ mkdir /data/media 0770 media_rw media_rw
+
on boot
setprop ro.build.product omap4sdp
setprop ro.product.device omap4sdp
setprop wifi.interface wlan0
+on fs
+ mount_all /fstab.omap4pandaboard
+
# create dhcpcd dir
mkdir /data/misc/dhcp 0770 dhcp dhcp
chmod 0770 /data/misc/dhcp
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 0a03928..4df343c 100644
--- a/overlay/frameworks/base/core/res/res/xml/storage_list.xml
+++ b/overlay/frameworks/base/core/res/res/xml/storage_list.xml
@@ -33,9 +33,8 @@
-->
<StorageList xmlns:android="http://schemas.android.com/apk/res/android">
- <storage android:mountPoint="/storage/sdcard0"
+ <storage android:mountPoint="/mnt/sdcard"
android:storageDescription="@string/storage_internal"
android:primary="true"
- android:emulated="true"
- android:mtpReserve="100" />
+ android:removable="true" />
</StorageList>
diff --git a/vold.fstab b/vold.fstab
index 2f4bb7b..10fe0c4 100644
--- a/vold.fstab
+++ b/vold.fstab
@@ -12,4 +12,4 @@
## <sysfs_path> - List of sysfs paths to source devices
######################
-dev_mount sdcard /storage/sdcard0 6 /devices/platform/omap/omap_hsmmc.0/mmc_host/mmc0
+dev_mount sdcard /mnt/sdcard 6 /devices/platform/omap/omap_hsmmc.0/mmc_host/mmc0
diff --git a/vold.fstab_tracking b/vold.fstab_tracking
index 8f0f8d0..5291c0e 100644
--- a/vold.fstab_tracking
+++ b/vold.fstab_tracking
@@ -12,4 +12,4 @@
## <sysfs_path> - List of sysfs paths to source devices
######################
-dev_mount sdcard /storage/sdcard0 6 /devices/platform/omap_hsmmc.0/mmc_host/mmc0
+dev_mount sdcard /mnt/sdcard 6 /devices/platform/omap_hsmmc.0/mmc_host/mmc0
