am 2dfe490f: system: vold: Ensure a default vold.conf exists for generic target
Merge commit '2dfe490f439e126119055e1888703cc3745f5389' into eclair-plus-aosp
* commit '2dfe490f439e126119055e1888703cc3745f5389':
system: vold: Ensure a default vold.conf exists for generic target
diff --git a/rootdir/Android.mk b/rootdir/Android.mk
index db98fab..779f2a9 100644
--- a/rootdir/Android.mk
+++ b/rootdir/Android.mk
@@ -8,6 +8,10 @@
etc/init.goldfish.sh \
etc/hosts
+ifeq ($(TARGET_PRODUCT),generic)
+copy_from := etc/vold.conf
+endif
+
copy_to := $(addprefix $(TARGET_OUT)/,$(copy_from))
copy_from := $(addprefix $(LOCAL_PATH)/,$(copy_from))
diff --git a/rootdir/etc/vold.conf b/rootdir/etc/vold.conf
new file mode 100644
index 0000000..4e04509
--- /dev/null
+++ b/rootdir/etc/vold.conf
@@ -0,0 +1,10 @@
+## vold configuration file for the 'generic' target
+
+volume_sdcard {
+ ## This is the direct uevent device path to the SD slot on the device
+ media_path /devices/platform/goldfish_mmc.0/mmc_host/mmc0
+
+ media_type mmc
+ mount_point /sdcard
+ ums_path /devices/platform/usb_mass_storage/lun0
+}