Evolution-X-Tensor/device_google_gs101
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge changes Ia94682ee,I4da3ce85 into sc-dev

Browse source 
* changes:
  gs101: remove unused fstabs for eMMC storage
  gs101: remove unneeded crypto properties
This commit is contained in:
Eric Biggers 2021-03-08 21:22:50 +00:00 • committed by Android (Google) Code Review
commit fa50bf6c7c
3 changed files with 2 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

12
conf/fstab.gs101.emmc
View file

@ -1,12 +0,0 @@
# Android fstab file.
#<src> <mnt_point> <type> <mnt_flags and options> <fs_mgr_flags>
# 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

14
conf/fstab.gs101.sdboot
View file

@ -1,14 +0,0 @@
# Android fstab file.
#<src> <mnt_point> <type> <mnt_flags and options> <fs_mgr_flags>
# 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

32
device.mk
View file

@ -57,21 +57,6 @@ else
LOCAL_KERNEL := $(TARGET_PREBUILT_KERNEL) LOCAL_KERNEL := $(TARGET_PREBUILT_KERNEL)
endif endif
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 # OEM Unlock reporting
PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
ro.oem_unlock_supported=1 ro.oem_unlock_supported=1
@ -221,23 +206,13 @@ endif
# Recovery files # Recovery files
PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \
device/google/gs101/conf/init.recovery.device.rc:$(TARGET_COPY_OUT_RECOVERY)/root/init.recovery.gs101.rc 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 += \ # Fstab 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)
PRODUCT_COPY_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_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.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.persist:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.persist \
device/google/gs101/conf/fstab.gs101:$(TARGET_COPY_OUT_VENDOR_RAMDISK)/first_stage_ramdisk/fstab.gs101 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 # Shell scripts
PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \
@ -281,9 +256,6 @@ PRODUCT_PACKAGES += \
tune2fs.vendor_ramdisk \ tune2fs.vendor_ramdisk \
resize2fs.vendor_ramdisk resize2fs.vendor_ramdisk
PRODUCT_PROPERTY_OVERRIDES += \
ro.crypto.volume.filenames_mode=aes-256-cts
# Userdata Checkpointing OTA GC # Userdata Checkpointing OTA GC
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
checkpoint_gc checkpoint_gc