diff options
| author | Wonil Kim <wonil@google.com> | 2022-08-01 04:26:56 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-08-01 04:26:56 +0000 |
| commit | 976dcf10742c9bd926377459c8b79731b1cb099e (patch) | |
| tree | 51ebdf18a73ff2ca8eafa6225c0db1305dacd1d9 /common | |
| parent | 9b42b3a7b123e7c0da103008cd67b8cbf07a54e3 (diff) | |
| parent | cf1952bf34f58bfdb44a3f63fa3138e0fc483005 (diff) | |
| download | car-976dcf10742c9bd926377459c8b79731b1cb099e.tar.gz | |
Disable adoptable_storage for car emulator (tm-qpr-dev) am: 7a877a40d5 am: cf1952bf34
Original change: https://googleplex-android-review.googlesource.com/c/device/generic/car/+/19465151
Change-Id: Iaac7f7fc53395554e2430aefd7fd2cff6d6a5093
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'common')
| -rw-r--r-- | common/car.mk | 4 | ||||
| -rw-r--r-- | common/fstab.ranchu.car | 10 |
2 files changed, 14 insertions, 0 deletions
diff --git a/common/car.mk b/common/car.mk index cbcf55a..5fea1f7 100644 --- a/common/car.mk +++ b/common/car.mk @@ -49,6 +49,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..8c51f28 --- /dev/null +++ b/common/fstab.ranchu.car @@ -0,0 +1,10 @@ +# Android fstab file. +#<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 +product /product ext4 ro,barrier=1 wait,logical,first_stage_mount +system_ext /system_ext 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,fsverity,keydirectory=/metadata/vold/metadata_encryption,latemount +/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% |