Enable Android to mount and format sdcard1 am: b66b788381
Change-Id: I4d77b207a19b147fb631291657a95c9a17b41631
diff --git a/shared/config/fstab b/shared/config/fstab
index 715c68b..ace3794 100644
--- a/shared/config/fstab
+++ b/shared/config/fstab
@@ -12,3 +12,4 @@
vendor /vendor ext4 noatime,ro,errors=panic wait,logical,first_stage_mount,slotselect
/dev/block/zram0 none swap defaults zramsize=75%
/tmp /sdcard none defaults,bind recoveryonly
+/devices/*/block/vdb auto auto defaults voldmanaged=sdcard1:auto,encryptable=userdata
diff --git a/shared/config/fstab.ext4 b/shared/config/fstab.ext4
index 3e3672f..9e8d5d9 100644
--- a/shared/config/fstab.ext4
+++ b/shared/config/fstab.ext4
@@ -12,3 +12,4 @@
vendor /vendor ext4 noatime,ro,errors=panic wait,logical,first_stage_mount,slotselect
/dev/block/zram0 none swap defaults zramsize=75%
/tmp /sdcard none defaults,bind recoveryonly
+/devices/*/block/vdb auto auto defaults voldmanaged=sdcard1:auto,encryptable=userdata
diff --git a/shared/config/init.vendor.rc b/shared/config/init.vendor.rc
index 55db430..66b6c75 100644
--- a/shared/config/init.vendor.rc
+++ b/shared/config/init.vendor.rc
@@ -1,6 +1,5 @@
on early-init
# loglevel 8
- symlink /sdcard /storage/sdcard0
mkdir /var/run 0755 root root
mkdir /var/run/media 0755 media root
mkdir /var/run/system 0755 system root
diff --git a/shared/phone/device.mk b/shared/phone/device.mk
index 09b61da..56bed4e 100644
--- a/shared/phone/device.mk
+++ b/shared/phone/device.mk
@@ -20,8 +20,6 @@
$(call inherit-product, frameworks/native/build/phone-xhdpi-2048-dalvik-heap.mk)
$(call inherit-product, device/google/cuttlefish/shared/device.mk)
-PRODUCT_CHARACTERISTICS := nosdcard
-
PRODUCT_PROPERTY_OVERRIDES += \
keyguard.no_require_sim=true \
ro.cdma.home.operator.alpha=Android \
diff --git a/shared/phone/device_vendor.mk b/shared/phone/device_vendor.mk
index e873ff2..1c4d2d4 100644
--- a/shared/phone/device_vendor.mk
+++ b/shared/phone/device_vendor.mk
@@ -25,8 +25,6 @@
$(call inherit-product, frameworks/native/build/phone-xhdpi-2048-dalvik-heap.mk)
$(call inherit-product, device/google/cuttlefish/shared/device.mk)
-PRODUCT_CHARACTERISTICS := nosdcard
-
PRODUCT_PROPERTY_OVERRIDES += \
keyguard.no_require_sim=true \
ro.cdma.home.operator.alpha=Android \