Mount system and vendor via the DTB
Test: Local build and boot
Bug: 69071989
Change-Id: I3ee68174ce84e5a1e29c70cd63b46fc58e684465
diff --git a/host_package.mk b/host_package.mk
index bcb6e64..9799679 100644
--- a/host_package.mk
+++ b/host_package.mk
@@ -43,10 +43,12 @@
libicuuc-host \
cvd_host_configs := \
- vsoc_mem.json
+ vsoc_mem.json \
+ cuttlefish.dtb
cvd_host_packages := \
vsoc_mem_json \
+ cuttlefish_dtb \
$(cvd_host_executables) \
$(cvd_host_tests) \
diff --git a/shared/config/fstab.vsoc b/shared/config/fstab.vsoc
index d1e28f0..9f4b3f7 100644
--- a/shared/config/fstab.vsoc
+++ b/shared/config/fstab.vsoc
@@ -1,5 +1,2 @@
-/dev/block/vda /system ext4 noatime,ro,errors=panic wait
/dev/block/vdb /data ext4 nodev,noatime,nosuid,errors=panic wait
/dev/block/vdc /cache ext4 nodev,noatime,nosuid,errors=panic wait
-/dev/block/vdd /vendor ext4 noatime,errors=panic wait
-
diff --git a/shared/config/init.vsoc.rc b/shared/config/init.vsoc.rc
index 56769ae..c2d588c 100644
--- a/shared/config/init.vsoc.rc
+++ b/shared/config/init.vsoc.rc
@@ -37,7 +37,7 @@
on fs
- mount_all /fstab.${ro.hardware}
+ mount_all /vendor/etc/fstab.${ro.hardware}
wait /vendor/etc/selinux/nonplat_mac_permissions.xml
restorecon_recursive /vendor
diff --git a/shared/device.mk b/shared/device.mk
index e1e57b5..e88567c 100644
--- a/shared/device.mk
+++ b/shared/device.mk
@@ -105,7 +105,7 @@
device/google/cuttlefish/shared/config/media_codecs_performance.xml:system/etc/media_codecs_performance.xml \
device/google/cuttlefish/shared/config/media_profiles.xml:system/etc/media_profiles.xml \
device/google/cuttlefish/shared/config/profile.root:root/profile \
- device/google/cuttlefish/shared/config/fstab.vsoc:root/fstab.vsoc \
+ device/google/cuttlefish/shared/config/fstab.vsoc:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.vsoc \
frameworks/av/media/libeffects/data/audio_effects.conf:system/etc/audio_effects.conf \
frameworks/av/media/libstagefright/data/media_codecs_google_audio.xml:system/etc/media_codecs_google_audio.xml \
frameworks/av/media/libstagefright/data/media_codecs_google_telephony.xml:system/etc/media_codecs_google_telephony.xml \
@@ -320,7 +320,8 @@
# TODO thermal
PRODUCT_PACKAGES += \
- vsoc_mem_json
+ vsoc_mem_json \
+ cuttlefish_dtb
# WLAN driver configuration files
PRODUCT_COPY_FILES += \