summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2021-05-04 17:48:24 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>2021-05-04 17:48:24 +0000
commit26cd6e6d74d86326629fcf7bc5d887c2b3032f2a (patch)
treee8c037584d2ed1ff635f45d0fb418f6adff89f4e
parent927da04c5ac776bc3aa9b75b28d6d93cc7110b69 (diff)
parentb9b82a0dd436fe4ec3dd8b6680916d3ace9d8abc (diff)
downloadcar-android11-platform-release.tar.gz
Change-Id: I42b33099d944c68ac55c95af856ce6e50871a700
-rw-r--r--common/car.mk4
-rw-r--r--common/fstab.ranchu.car9
2 files changed, 13 insertions, 0 deletions
diff --git a/common/car.mk b/common/car.mk
index 190027b..1a98679 100644
--- a/common/car.mk
+++ b/common/car.mk
@@ -46,6 +46,10 @@ PRODUCT_COPY_FILES += \
device/generic/car/common/android.hardware.disable.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.fingerprint.xml \
device/generic/car/common/android.hardware.disable.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.wifi.direct.xml \
+# Overwrite goldfish fstab.ranchu to turn off adoptable_storage
+PRODUCT_COPY_FILES += \
+ device/generic/car/common/fstab.ranchu.car:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.ranchu
+
# Enable landscape
PRODUCT_COPY_FILES += \
frameworks/native/data/etc/android.hardware.screen.landscape.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.screen.landscape.xml
diff --git a/common/fstab.ranchu.car b/common/fstab.ranchu.car
new file mode 100644
index 0000000..1ff0331
--- /dev/null
+++ b/common/fstab.ranchu.car
@@ -0,0 +1,9 @@
+# Android fstab file.
+# This is a copy of device/generic/goldfish/fstab.ranchu, but removing encryptable=userdata to turn off adoptable_storage
+#<dev> <mnt_point> <type> <mnt_flags options> <fs_mgr_flags>
+system /system ext4 ro,barrier=1 wait,logical,avb=vbmeta,first_stage_mount
+vendor /vendor ext4 ro,barrier=1 wait,logical,first_stage_mount
+/dev/block/vdc /data ext4 noatime,nosuid,nodev,nomblk_io_submit,errors=panic wait,check,quota,fileencryption=aes-256-xts:aes-256-cts,reservedsize=128M
+/dev/block/pci/pci0000:00/0000:00:06.0/by-name/metadata /metadata ext4 noatime,nosuid,nodev wait,formattable,first_stage_mount
+/devices/*/block/vdf auto auto defaults voldmanaged=sdcard:auto
+dev/block/zram0 none swap defaults zramsize=75%