Snap for 9905614 from c6dcc00b240a43a89f1733307640b12b32a504cb to tm-qpr3-release
Change-Id: I9bf6ed9ce28df30b744c5df0d654d6475f220236
diff --git a/64bitonly/product/arm64-vendor.mk b/64bitonly/product/arm64-vendor.mk
index eff9352..ee39483 100644
--- a/64bitonly/product/arm64-vendor.mk
+++ b/64bitonly/product/arm64-vendor.mk
@@ -14,9 +14,8 @@
# take priority and override the rules it inherit from other mk files
# see copy file rules in core/Makefile
PRODUCT_COPY_FILES += \
- device/generic/goldfish/fstab.ranchu.initrd.arm.ex:$(TARGET_COPY_OUT_VENDOR_RAMDISK)/first_stage_ramdisk/fstab.ranchu \
- device/generic/goldfish/fstab.ranchu.initrd.arm.ex:$(TARGET_COPY_OUT_VENDOR_RAMDISK)/fstab.ranchu \
- device/generic/goldfish/fstab.ranchu.arm.ex:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.ranchu \
+ device/generic/goldfish/fstab.ranchu.arm:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.ranchu \
+ device/generic/goldfish/fstab.ranchu.arm:$(TARGET_COPY_OUT_VENDOR_RAMDISK)/first_stage_ramdisk/fstab.ranchu \
device/generic/goldfish/data/etc/encryptionkey.img:encryptionkey.img \
device/generic/goldfish/task_profiles.json:$(TARGET_COPY_OUT_VENDOR)/etc/task_profiles.json \
$(EMULATOR_KERNEL_FILE):kernel-ranchu \
diff --git a/64bitonly/product/vendor.mk b/64bitonly/product/vendor.mk
index 9a613d4..9749c67 100644
--- a/64bitonly/product/vendor.mk
+++ b/64bitonly/product/vendor.mk
@@ -290,7 +290,6 @@
device/generic/goldfish/init.ranchu-net.sh:$(TARGET_COPY_OUT_VENDOR)/bin/init.ranchu-net.sh \
device/generic/goldfish/init.ranchu.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.ranchu.rc \
device/generic/goldfish/init.system_ext.rc:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/init/init.system_ext.rc \
- device/generic/goldfish/fstab.ranchu:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.ranchu \
device/generic/goldfish/ueventd.ranchu.rc:$(TARGET_COPY_OUT_VENDOR)/etc/ueventd.rc \
device/generic/goldfish/input/virtio_input_rotary.idc:$(TARGET_COPY_OUT_VENDOR)/usr/idc/virtio_input_rotary.idc \
device/generic/goldfish/input/qwerty2.idc:$(TARGET_COPY_OUT_VENDOR)/usr/idc/qwerty2.idc \
diff --git a/64bitonly/product/x86_64-vendor.mk b/64bitonly/product/x86_64-vendor.mk
index 8eae4c9..dc334a5 100644
--- a/64bitonly/product/x86_64-vendor.mk
+++ b/64bitonly/product/x86_64-vendor.mk
@@ -33,6 +33,5 @@
debug.stagefright.ccodec=4
PRODUCT_COPY_FILES += \
- device/generic/goldfish/fstab.ranchu.initrd.ex:$(TARGET_COPY_OUT_VENDOR_RAMDISK)/first_stage_ramdisk/fstab.ranchu \
- device/generic/goldfish/fstab.ranchu.initrd.ex:$(TARGET_COPY_OUT_VENDOR_RAMDISK)/fstab.ranchu \
- device/generic/goldfish/fstab.ranchu.ex:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.ranchu
+ device/generic/goldfish/fstab.ranchu.x86:$(TARGET_COPY_OUT_VENDOR_RAMDISK)/first_stage_ramdisk/fstab.ranchu \
+ device/generic/goldfish/fstab.ranchu.x86:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.ranchu
diff --git a/arm64-vendor.mk b/arm64-vendor.mk
index 463e79b..daa8280 100644
--- a/arm64-vendor.mk
+++ b/arm64-vendor.mk
@@ -14,9 +14,8 @@
# take priority and override the rules it inherit from other mk files
# see copy file rules in core/Makefile
PRODUCT_COPY_FILES += \
- device/generic/goldfish/fstab.ranchu.initrd.arm.ex:$(TARGET_COPY_OUT_VENDOR_RAMDISK)/first_stage_ramdisk/fstab.ranchu \
- device/generic/goldfish/fstab.ranchu.initrd.arm.ex:$(TARGET_COPY_OUT_VENDOR_RAMDISK)/fstab.ranchu \
- device/generic/goldfish/fstab.ranchu.arm.ex:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.ranchu \
+ device/generic/goldfish/fstab.ranchu.arm:$(TARGET_COPY_OUT_VENDOR_RAMDISK)/first_stage_ramdisk/fstab.ranchu \
+ device/generic/goldfish/fstab.ranchu.arm:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.ranchu \
device/generic/goldfish/data/etc/encryptionkey.img:encryptionkey.img \
device/generic/goldfish/task_profiles.json:$(TARGET_COPY_OUT_VENDOR)/etc/task_profiles.json \
$(EMULATOR_KERNEL_FILE):kernel-ranchu \
diff --git a/fstab.ranchu b/fstab.ranchu
deleted file mode 100644
index 157c9ed..0000000
--- a/fstab.ranchu
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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
-/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,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,encryptable=userdata
-dev/block/zram0 none swap defaults zramsize=75%
diff --git a/fstab.ranchu.arm.ex b/fstab.ranchu.arm
similarity index 95%
rename from fstab.ranchu.arm.ex
rename to fstab.ranchu.arm
index 837deef..f2f9035 100644
--- a/fstab.ranchu.arm.ex
+++ b/fstab.ranchu.arm
@@ -9,3 +9,4 @@
/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/platform/a003c00.virtio_mmio/by-name/metadata /metadata ext4 noatime,nosuid,nodev wait,formattable,first_stage_mount
/devices/*/block/vdf auto auto defaults voldmanaged=sdcard:auto,encryptable=userdata
+/dev/block/zram0 none swap defaults zramsize=75%
diff --git a/fstab.ranchu.initrd.arm.ex b/fstab.ranchu.initrd.arm.ex
deleted file mode 100644
index b9e30f1..0000000
--- a/fstab.ranchu.initrd.arm.ex
+++ /dev/null
@@ -1,7 +0,0 @@
-# Android fstab file.
-#<dev> <mnt_point> <type> <mnt_flags options> <fs_mgr_flags>
-system /system ext4 ro,barrier=1 wait,logical,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/platform/a003c00.virtio_mmio/by-name/metadata /metadata ext4 noatime,nosuid,nodev wait,formattable,first_stage_mount
diff --git a/fstab.ranchu.initrd.ex b/fstab.ranchu.initrd.ex
deleted file mode 100644
index 971d83a..0000000
--- a/fstab.ranchu.initrd.ex
+++ /dev/null
@@ -1,7 +0,0 @@
-# Android fstab file for ramdisk
-#<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/pci/pci0000:00/0000:00:06.0/by-name/metadata /metadata ext4 noatime,nosuid,nodev wait,formattable,first_stage_mount
diff --git a/fstab.ranchu.ex b/fstab.ranchu.x86
similarity index 94%
rename from fstab.ranchu.ex
rename to fstab.ranchu.x86
index 5fe5b80..c24961b 100644
--- a/fstab.ranchu.ex
+++ b/fstab.ranchu.x86
@@ -7,4 +7,4 @@
/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,encryptable=userdata
-dev/block/zram0 none swap defaults zramsize=75%
+/dev/block/zram0 none swap defaults zramsize=75%
diff --git a/vendor.mk b/vendor.mk
index dcc61f1..86adf98 100644
--- a/vendor.mk
+++ b/vendor.mk
@@ -288,7 +288,6 @@
device/generic/goldfish/init.ranchu-net.sh:$(TARGET_COPY_OUT_VENDOR)/bin/init.ranchu-net.sh \
device/generic/goldfish/init.ranchu.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.ranchu.rc \
device/generic/goldfish/init.system_ext.rc:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/init/init.system_ext.rc \
- device/generic/goldfish/fstab.ranchu:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.ranchu \
device/generic/goldfish/ueventd.ranchu.rc:$(TARGET_COPY_OUT_VENDOR)/etc/ueventd.rc \
device/generic/goldfish/input/virtio_input_rotary.idc:$(TARGET_COPY_OUT_VENDOR)/usr/idc/virtio_input_rotary.idc \
device/generic/goldfish/input/qwerty2.idc:$(TARGET_COPY_OUT_VENDOR)/usr/idc/qwerty2.idc \
diff --git a/x86-vendor.mk b/x86-vendor.mk
index 1549411..03b7d6d 100644
--- a/x86-vendor.mk
+++ b/x86-vendor.mk
@@ -27,6 +27,5 @@
TARGET_USES_MKE2FS := true
PRODUCT_COPY_FILES += \
- device/generic/goldfish/fstab.ranchu.initrd.ex:$(TARGET_COPY_OUT_VENDOR_RAMDISK)/first_stage_ramdisk/fstab.ranchu \
- device/generic/goldfish/fstab.ranchu.initrd.ex:$(TARGET_COPY_OUT_VENDOR_RAMDISK)/fstab.ranchu \
- device/generic/goldfish/fstab.ranchu.ex:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.ranchu
+ device/generic/goldfish/fstab.ranchu.x86:$(TARGET_COPY_OUT_VENDOR_RAMDISK)/first_stage_ramdisk/fstab.ranchu \
+ device/generic/goldfish/fstab.ranchu.x86:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.ranchu
diff --git a/x86_64-vendor.mk b/x86_64-vendor.mk
index 2edd39d..b62b2c5 100644
--- a/x86_64-vendor.mk
+++ b/x86_64-vendor.mk
@@ -40,6 +40,5 @@
TARGET_USES_MKE2FS := true
PRODUCT_COPY_FILES += \
- device/generic/goldfish/fstab.ranchu.initrd.ex:$(TARGET_COPY_OUT_VENDOR_RAMDISK)/first_stage_ramdisk/fstab.ranchu \
- device/generic/goldfish/fstab.ranchu.initrd.ex:$(TARGET_COPY_OUT_VENDOR_RAMDISK)/fstab.ranchu \
- device/generic/goldfish/fstab.ranchu.ex:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.ranchu
+ device/generic/goldfish/fstab.ranchu.x86:$(TARGET_COPY_OUT_VENDOR_RAMDISK)/first_stage_ramdisk/fstab.ranchu \
+ device/generic/goldfish/fstab.ranchu.x86:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.ranchu