From 3014832d9a82a5b44fb46036d23d84d0bafd39ed Mon Sep 17 00:00:00 2001 From: Eric Biggers Date: Mon, 8 Mar 2021 10:17:55 -0800 Subject: [PATCH 1/2] gs101: remove unneeded crypto properties It is unnessary to set ro.crypto.dm_default_key.options_format.version=2 or ro.crypto.volume.filenames_mode=aes-256-cts on devices with PRODUCT_SHIPPING_API_LEVEL >= 30, since in that case these settings are already the default. Bug: 181883233 Change-Id: I4da3ce857a45c479e5efcee481f74031093234d8 --- device.mk | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/device.mk b/device.mk index 3acf0fca..8e30f2a8 100644 --- a/device.mk +++ b/device.mk @@ -61,17 +61,6 @@ LOCAL_USES_SDMMC_BOOT := false LOCAL_USES_UFS_BOOT := true LOCAL_USES_EMMC_BOOT := false -# Metadata Encryption -# Because the kernel interface to dm-default-key changed in Android R, -# you also need to ensure that you have set the correct value for -# PRODUCT_SHIPPING_API_LEVEL in device.mk. For example, if your device -# launches with Android R (API level 30), device.mk should contain: -# PRODUCT_SHIPPING_API_LEVEL := 30 -# You can also set the following system property to force the use of -# the new dm-default-key API regardless of shipping API level: -PRODUCT_PROPERTY_OVERRIDES += \ - ro.crypto.dm_default_key.options_format.version=2 - # OEM Unlock reporting PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \ ro.oem_unlock_supported=1 @@ -281,9 +270,6 @@ PRODUCT_PACKAGES += \ tune2fs.vendor_ramdisk \ resize2fs.vendor_ramdisk -PRODUCT_PROPERTY_OVERRIDES += \ - ro.crypto.volume.filenames_mode=aes-256-cts - # Userdata Checkpointing OTA GC PRODUCT_PACKAGES += \ checkpoint_gc From 93b740b0b092892d0f989f788d9f29b60d6ad0d1 Mon Sep 17 00:00:00 2001 From: Eric Biggers Date: Mon, 8 Mar 2021 10:17:55 -0800 Subject: [PATCH 2/2] gs101: remove unused fstabs for eMMC storage These devices will only use UFS, so remove the emmc and sdboot fstab files which are unused and outdated. Bug: 181883233 Change-Id: Ia94682eecca4d792c2a50d2336cd6a542ed282db --- conf/fstab.gs101.emmc | 12 ------------ conf/fstab.gs101.sdboot | 14 -------------- device.mk | 18 ++---------------- 3 files changed, 2 insertions(+), 42 deletions(-) delete mode 100644 conf/fstab.gs101.emmc delete mode 100644 conf/fstab.gs101.sdboot diff --git a/conf/fstab.gs101.emmc b/conf/fstab.gs101.emmc deleted file mode 100644 index 076978d1..00000000 --- a/conf/fstab.gs101.emmc +++ /dev/null @@ -1,12 +0,0 @@ -# Android fstab file. -# -# The filesystem that contains the filesystem checker binary (typically /system) cannot -# specify MF_CHECK, and must come before any filesystems that do specify MF_CHECK - - -#/dev/block/mmcblk0p2 /system ext4 ro wait -/dev/block/mmcblk0p3 /cache ext4 noatime,nosuid,nodev,nomblk_io_submit,errors=panic wait -/dev/block/mmcblk0p4 /data ext4 noatime,nosuid,nodev,nomblk_io_submit,noauto_da_alloc,errors=panic wait - -# VOLD -/devices/13d00000.dwmmc2/mmc_host/mmc1 /storage/sdcard vfat default voldmanaged=sdcard:auto diff --git a/conf/fstab.gs101.sdboot b/conf/fstab.gs101.sdboot deleted file mode 100644 index dd879551..00000000 --- a/conf/fstab.gs101.sdboot +++ /dev/null @@ -1,14 +0,0 @@ -# Android fstab file. -# -# The filesystem that contains the filesystem checker binary (typically /system) cannot -# specify MF_CHECK, and must come before any filesystems that do specify MF_CHECK - - -#/dev/block/mmcblk1p2 /system ext4 ro wait -/dev/block/mmcblk1p4 /cache ext4 noatime,nosuid,nodev,nomblk_io_submit,errors=panic wait -/dev/block/mmcblk1p3 /data ext4 noatime,nosuid,nodev,nomblk_io_submit,noauto_da_alloc,errors=panic wait -/dev/block/mmcblk1p8 /efs ext4 defaults,rw wait - -# VOLD -/devices/10c00000.usb auto vfat default voldmanaged=usb1:auto -/devices/10c00000.usb/10c00000.dwc3/xhci-hcd auto vfat default voldmanaged=usb2:auto diff --git a/device.mk b/device.mk index 8e30f2a8..74d8e83e 100644 --- a/device.mk +++ b/device.mk @@ -57,10 +57,6 @@ else LOCAL_KERNEL := $(TARGET_PREBUILT_KERNEL) endif -LOCAL_USES_SDMMC_BOOT := false -LOCAL_USES_UFS_BOOT := true -LOCAL_USES_EMMC_BOOT := false - # OEM Unlock reporting PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \ ro.oem_unlock_supported=1 @@ -210,23 +206,13 @@ endif # Recovery files PRODUCT_COPY_FILES += \ device/google/gs101/conf/init.recovery.device.rc:$(TARGET_COPY_OUT_RECOVERY)/root/init.recovery.gs101.rc -ifeq ($(LOCAL_USES_SDMMC_BOOT),true) -PRODUCT_COPY_FILES += \ - device/google/gs101/conf/fstab.gs101.sdboot:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.gs101 \ - device/google/gs101/conf/fstab.gs101.sdboot:$(TARGET_COPY_OUT_RECOVERY)/root/first_stage_ramdisk/fstab.gs101 -else -ifeq ($(LOCAL_USES_UFS_BOOT),true) + +# Fstab files PRODUCT_COPY_FILES += \ device/google/gs101/conf/fstab.gs101:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.gs101 \ device/google/gs101/conf/fstab.gs101:$(TARGET_COPY_OUT_RECOVERY)/root/first_stage_ramdisk/fstab.gs101 \ device/google/gs101/conf/fstab.persist:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.persist \ device/google/gs101/conf/fstab.gs101:$(TARGET_COPY_OUT_VENDOR_RAMDISK)/first_stage_ramdisk/fstab.gs101 -else -PRODUCT_COPY_FILES += \ - device/google/gs101/conf/fstab.gs101.emmc:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.gs101 \ - device/google/gs101/conf/fstab.gs101.emmc:$(TARGET_COPY_OUT_RECOVERY)/root/first_stage_ramdisk/fstab.gs101 -endif -endif # Shell scripts PRODUCT_COPY_FILES += \