diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2021-05-04 17:48:24 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2021-05-04 17:48:24 +0000 |
commit | 26cd6e6d74d86326629fcf7bc5d887c2b3032f2a (patch) | |
tree | e8c037584d2ed1ff635f45d0fb418f6adff89f4e | |
parent | 927da04c5ac776bc3aa9b75b28d6d93cc7110b69 (diff) | |
parent | b9b82a0dd436fe4ec3dd8b6680916d3ace9d8abc (diff) | |
download | car-android11-platform-release.tar.gz |
Snap for 7316203 from b9b82a0dd436fe4ec3dd8b6680916d3ace9d8abc to rvc-platform-releaseandroid-platform-11.0.0_r9android-platform-11.0.0_r8android-platform-11.0.0_r7android-platform-11.0.0_r40android-platform-11.0.0_r39android-platform-11.0.0_r38android-platform-11.0.0_r37android-platform-11.0.0_r36android-platform-11.0.0_r35android-platform-11.0.0_r34android-platform-11.0.0_r33android-platform-11.0.0_r32android-platform-11.0.0_r31android-platform-11.0.0_r30android-platform-11.0.0_r29android-platform-11.0.0_r28android-platform-11.0.0_r27android-platform-11.0.0_r26android-platform-11.0.0_r25android-platform-11.0.0_r24android-platform-11.0.0_r23android-platform-11.0.0_r22android-platform-11.0.0_r21android-platform-11.0.0_r20android-platform-11.0.0_r19android-platform-11.0.0_r18android-platform-11.0.0_r17android-platform-11.0.0_r16android-platform-11.0.0_r15android-platform-11.0.0_r14android-platform-11.0.0_r13android-platform-11.0.0_r12android-platform-11.0.0_r11android-platform-11.0.0_r10android11-platform-release
Change-Id: I42b33099d944c68ac55c95af856ce6e50871a700
-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% |