sdm660-common: Add support for lavender (Redmi Note 7/7S)

* add A-only SAR fstab
* hax manifest keymaster version

Signed-off-by: Rama Bondan Prakoso <ramanarubp@gmail.com>
This commit is contained in:
Rama Bondan Prakoso 2019-10-31 09:52:19 +00:00
parent cb8b00f933
commit 153cfbd83f
5 changed files with 40 additions and 4 deletions

View file

@ -16,7 +16,7 @@
LOCAL_PATH := $(call my-dir) LOCAL_PATH := $(call my-dir)
ifneq ($(filter twolip jasmine_sprout wayne clover,$(TARGET_DEVICE)),) ifneq ($(filter twolip jasmine_sprout wayne clover lavender,$(TARGET_DEVICE)),)
$(shell mkdir -p $(TARGET_OUT_VENDOR)/firmware; \ $(shell mkdir -p $(TARGET_OUT_VENDOR)/firmware; \
ln -sf /dev/block/bootdevice/by-name/msadp \ ln -sf /dev/block/bootdevice/by-name/msadp \

View file

@ -192,7 +192,11 @@ BOARD_VENDOR_QCOM_GPS_LOC_API_HARDWARE := $(TARGET_BOARD_PLATFORM)
# HIDL # HIDL
DEVICE_FRAMEWORK_MANIFEST_FILE := $(COMMON_PATH)/framework_manifest.xml DEVICE_FRAMEWORK_MANIFEST_FILE := $(COMMON_PATH)/framework_manifest.xml
ifneq ($(filter lavender,$(TARGET_DEVICE)),)
DEVICE_MANIFEST_FILE := $(shell sed 's/3.0/4.0/g' $(COMMON_PATH)/manifest.xml > manifest.xml && echo manifest.xml)
else
DEVICE_MANIFEST_FILE := $(COMMON_PATH)/manifest.xml DEVICE_MANIFEST_FILE := $(COMMON_PATH)/manifest.xml
endif
DEVICE_MATRIX_FILE := $(COMMON_PATH)/compatibility_matrix.xml DEVICE_MATRIX_FILE := $(COMMON_PATH)/compatibility_matrix.xml
# HWUI # HWUI
@ -249,7 +253,9 @@ TARGET_USES_INTERACTION_BOOST := true
BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED := true BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED := true
# Recovery # Recovery
ifeq ($(AB_OTA_UPDATER), true) ifneq ($(filter lavender,$(TARGET_DEVICE)),)
TARGET_RECOVERY_FSTAB := $(COMMON_PATH)/rootdir/etc/fstab_A.qcom
else ifeq ($(AB_OTA_UPDATER), true)
TARGET_RECOVERY_FSTAB := $(COMMON_PATH)/rootdir/etc/fstab_AB.qcom TARGET_RECOVERY_FSTAB := $(COMMON_PATH)/rootdir/etc/fstab_AB.qcom
else else
TARGET_RECOVERY_FSTAB := $(COMMON_PATH)/rootdir/etc/fstab.qcom TARGET_RECOVERY_FSTAB := $(COMMON_PATH)/rootdir/etc/fstab.qcom

View file

@ -87,7 +87,9 @@ include $(CLEAR_VARS)
LOCAL_MODULE := fstab.qcom LOCAL_MODULE := fstab.qcom
LOCAL_MODULE_TAGS := optional LOCAL_MODULE_TAGS := optional
LOCAL_MODULE_CLASS := ETC LOCAL_MODULE_CLASS := ETC
ifeq ($(AB_OTA_UPDATER), true) ifneq ($(filter lavender,$(TARGET_DEVICE)),)
LOCAL_SRC_FILES := etc/fstab_A.qcom
else ifeq ($(AB_OTA_UPDATER), true)
LOCAL_SRC_FILES := etc/fstab_AB.qcom LOCAL_SRC_FILES := etc/fstab_AB.qcom
else else
LOCAL_SRC_FILES := etc/fstab.qcom LOCAL_SRC_FILES := etc/fstab.qcom

28
rootdir/etc/fstab_A.qcom Normal file
View file

@ -0,0 +1,28 @@
# 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
# NOTE: /system and /vendor partitions are now early-mounted and the fstab entry is specified in device tree (duplicated below for recovery image purposes only):
# /proc/device-tree/firmware/android/fstab/system
# /proc/device-tree/firmware/android/fstab/vendor
#TODO: Add 'check' as fs_mgr_flags with data partition.
# Currently we dont have e2fsck compiled. So fs check would failed.
# Non-A/B fstab.qcom variant
#<src> <mnt_point> <type> <mnt_flags and options> <fs_mgr_flags>
/dev/block/bootdevice/by-name/userdata /data ext4 nosuid,nodev,barrier=1,noauto_da_alloc,discard,noatime,lazytime wait,check,forceencrypt=footer,quota,reservedsize=128M
/dev/block/bootdevice/by-name/userdata /data f2fs noatime,nosuid,nodev,nodiratime,fsync_mode=nobarrier,background_gc=off wait,check,forceencrypt=footer,quota,reservedsize=128M
/devices/soc/c084000.sdhci/mmc_host* /storage/sdcard1 vfat nosuid,nodev wait,voldmanaged=sdcard1:auto,encryptable=footer
/dev/block/bootdevice/by-name/misc /misc emmc defaults defaults
/dev/block/bootdevice/by-name/modem /vendor/firmware_mnt vfat ro,shortname=lower,uid=1000,gid=1000,dmask=227,fmask=337,context=u:object_r:firmware_file:s0 wait
/dev/block/bootdevice/by-name/bluetooth /vendor/bt_firmware vfat ro,shortname=lower,uid=1002,gid=3002,dmask=227,fmask=337,context=u:object_r:bt_firmware_file:s0 wait
/devices/soc/a800000.ssusb/a800000.dwc3/xhci-hcd.0.auto* /storage/usbotg vfat nosuid,nodev wait,voldmanaged=usbotg:auto
/dev/block/bootdevice/by-name/dsp /vendor/dsp ext4 ro,nosuid,nodev,barrier=1 wait
/dev/block/bootdevice/by-name/cache /cache ext4 nosuid,nodev,noatime,barrier=1 wait
/dev/block/bootdevice/by-name/cache /cache f2fs noatime,nosuid,nodev,nodiratime,discard,fsync_mode=nobarrier,inline_xattr,inline_data,data_flush wait
/dev/block/bootdevice/by-name/persist /mnt/vendor/persist ext4 nosuid,nodev,barrier=1,noatime wait,check
/dev/block/bootdevice/by-name/system / ext4 ro,barrier=1 wait
/dev/block/bootdevice/by-name/vendor /vendor ext4 ro,barrier=1 wait,recoveryonly
/dev/block/bootdevice/by-name/boot /boot emmc defaults defaults

View file

@ -39,7 +39,7 @@ fi
setup_vendor "$DEVICE_COMMON" "$VENDOR" "$LINEAGE_ROOT" true setup_vendor "$DEVICE_COMMON" "$VENDOR" "$LINEAGE_ROOT" true
# Copyright headers and guards # Copyright headers and guards
write_headers "twolip jasmine_sprout wayne clover" write_headers "twolip jasmine_sprout wayne clover lavender"
write_makefiles "$MY_DIR"/proprietary-files.txt true write_makefiles "$MY_DIR"/proprietary-files.txt true