diff options
| author | Calvin Huang <calhuang@google.com> | 2021-03-23 03:51:21 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-03-23 03:51:21 +0000 |
| commit | 8b9d773f6d3b517b8b5bdd0cdab0e0bdb725cde3 (patch) | |
| tree | f4949a1a20512f835074cf5e79a93af51c89b701 | |
| parent | 20c665112827591086fa0ce513524b218f8f3ace (diff) | |
| parent | 3c78a69f98f4dd54982903f546ff63af8970580f (diff) | |
| download | car-temp_ab_7272582.tar.gz | |
Disable adoptable_storage for car emulator am: 3c78a69f98temp_ab_7272582
Original change: https://googleplex-android-review.googlesource.com/c/device/generic/car/+/13933352
Change-Id: I0cc9e3b2df98894f1164ed8c51f8954ee154cec8
| -rw-r--r-- | common/car.mk | 4 | ||||
| -rw-r--r-- | common/fstab.ranchu.car | 9 |
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% |