From: mauronofrio Date: Sat, 29 Dec 2018 10:21:04 +0000 (+0100) Subject: Latest fixes X-Git-Url: https://git.stricted.de/?p=GitHub%2Fmoto-9609%2Ftwrp_device_motorola_troika.git;a=commitdiff_plain;h=41b3d004e299bf521b4921ca20a34ee1711a7a00 Latest fixes --- diff --git a/BoardConfig.mk b/BoardConfig.mk index b485b59..d7251ed 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -25,16 +25,16 @@ # Architecture TARGET_ARCH := arm64 -TARGET_ARCH_VARIANT := armv8-a +TARGET_ARCH_VARIANT := armv8-2a TARGET_CPU_ABI := arm64-v8a TARGET_CPU_ABI2 := -TARGET_CPU_VARIANT := kryo +TARGET_CPU_VARIANT := cortex-a75 TARGET_2ND_ARCH := arm -TARGET_2ND_ARCH_VARIANT := armv7-a-neon +TARGET_2ND_ARCH_VARIANT := armv8-a TARGET_2ND_CPU_ABI := armeabi-v7a TARGET_2ND_CPU_ABI2 := armeabi -TARGET_2ND_CPU_VARIANT := cortex-a53 +TARGET_2ND_CPU_VARIANT := cortex-a75 ENABLE_CPUSETS := true ENABLE_SCHEDBOOST := true @@ -54,6 +54,7 @@ TARGET_PREBUILT_KERNEL := device/oneplus/fajita/prebuilt/Image.gz-dtb # Platform TARGET_BOARD_PLATFORM := sdm845 TARGET_BOARD_PLATFORM_GPU := qcom-adreno630 +QCOM_BOARD_PLATFORMS += sdm845 # Partitions BOARD_FLASH_BLOCK_SIZE := 262144 @@ -78,6 +79,7 @@ BOARD_BUILD_SYSTEM_ROOT_IMAGE := true TARGET_RECOVERY_WIPE := device/oneplus/fajita/recovery.wipe TARGET_RECOVERY_FSTAB := device/oneplus/fajita/fstab.hardware + # Workaround for error copying vendor files to recovery ramdisk BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4 TARGET_COPY_OUT_VENDOR := vendor @@ -90,21 +92,18 @@ BOARD_HAS_NO_SELECT_BUTTON := true BOARD_HAS_NO_REAL_SDCARD := true RECOVERY_SDCARD_ON_DATA := true TARGET_RECOVERY_QCOM_RTC_FIX := true -TW_BRIGHTNESS_PATH := "/sys/class/backlight/panel0-backlight/brightness" +TW_BRIGHTNESS_PATH := "/sys/class/backlight/pane10-backlight/brightness" TW_EXCLUDE_DEFAULT_USB_INIT := true TW_EXCLUDE_SUPERSU := true TW_EXTRA_LANGUAGES := true TW_INCLUDE_NTFS_3G := true AB_OTA_UPDATER := true -BOARD_BUILD_SYSTEM_ROOT_IMAGE := true TW_INPUT_BLACKLIST := "hbtp_vm" -TW_MAX_BRIGHTNESS := 1023 +TW_MAX_BRIGHTNESS := 1023 TW_DEFAULT_BRIGHTNESS := 420 -# set portrait_hdpi_notch to use the notch theme (and finally see the clock) -TW_THEME := portrait_hdpi_notch +TW_THEME := portrait_hdpi_notch TARGET_RECOVERY_DEVICE_MODULES += android.hardware.boot@1.0 -#TW_RECOVERY_ADDITIONAL_RELINK_FILES := ${OUT}/system/lib64/android.hardware.boot@1.0.so -TARGET_USE_CUSTOM_LUN_FILE_PATH := "/config/usb_gadget/g1/functions/mass_storage.0/lun.%d/file" +TARGET_USE_CUSTOM_LUN_FILE_PATH := /config/usb_gadget/g1/functions/mass_storage.0/lun.%d/file TARGET_RECOVERY_PIXEL_FORMAT := BGRA_8888 TW_NO_SCREEN_BLANK := true TW_USE_TOOLBOX := true @@ -131,6 +130,6 @@ TW_INCLUDE_CRYPTO_FBE := true # Extras BOARD_SUPPRESS_SECURE_ERASE := true TW_USE_LEDS_HAPTICS := true -TW_EXCLUDE_TWRPAPP := true USE_RECOVERY_INSTALLER := true RECOVERY_INSTALLER_PATH := device/oneplus/fajita/installer +TW_EXCLUDE_TWRPAPP := true diff --git a/device.mk b/device.mk index 82c02f3..3df6297 100644 --- a/device.mk +++ b/device.mk @@ -4,6 +4,7 @@ LOCAL_PATH := device/oneplus/fajita # define hardware platform PRODUCT_PLATFORM := sdm845 +#TEST # A/B support PRODUCT_PACKAGES += \ otapreopt_script \ @@ -28,7 +29,11 @@ PRODUCT_STATIC_BOOT_CONTROL_HAL := \ libz \ libcutils + # Boot control HAL PRODUCT_PACKAGES += \ android.hardware.boot@1.0-impl \ - android.hardware.boot@1.0-service + android.hardware.boot@1.0-service \ + + + diff --git a/recovery.fstab b/recovery.fstab index e4f5192..9fd369c 100644 --- a/recovery.fstab +++ b/recovery.fstab @@ -1,4 +1,4 @@ -# Copyright (c) 2017, The Linux Foundation. All rights reserved. +# Copyright (c) 2017-2018, The Linux Foundation. All rights reserved. # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are @@ -25,17 +25,15 @@ # OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN # IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# Vendor variant of recovery.fstab. Same as recovery.fstab, with additional vendor entry. +# A/B recovery.fstab variant. #device mount point fstype [device2] [length=] -/dev/block/bootdevice/by-name/system /system ext4 ro,barrier=1 wait,slotselect -/dev/block/bootdevice/by-name/vendor /vendor ext4 ro,barrier=1 wait,slotselect -/dev/block/bootdevice/by-name/op2 /op2 ext4 noatime,nosuid,nodev,barrier=1,data=ordered wait,check -/dev/block/bootdevice/by-name/userdata /data ext4 noatime,nosuid,nodev,barrier=1,data=ordered,noauto_da_alloc wait,check,fileencryption=ice,quota,reservedsize=512M -/dev/block/bootdevice/by-name/userdata /data f2fs noatime,nosuid,nodev,discard wait,check,fileencryption=ice,quota -/dev/block/bootdevice/by-name/boot /boot emmc defaults defaults -/dev/block/bootdevice/by-name/recovery /recovery emmc defaults defaults -/dev/block/bootdevice/by-name/misc /misc emmc defaults defaults -/devices/platform/soc/a600000.ssusb/a600000.dwc3/xhci-hcd.*.auto* /storage/usbotg vfat nosuid,nodev wait,voldmanaged=usbotg:auto -/devices/platform/soc/a800000.ssusb/a800000.dwc3/xhci-hcd.*.auto* /storage/usbotg vfat nosuid,nodev wait,voldmanaged=usbotg:auto +/dev/block/bootdevice/by-name/system /system ext4 ro,barrier=1 wait,slotselect +/dev/block/bootdevice/by-name/op2 /op2 ext4 noatime,nosuid,nodev,barrier=1,data=ordered wait,check +/dev/block/bootdevice/by-name/vendor /vendor ext4 ro,barrier=1 wait,slotselect +/dev/block/bootdevice/by-name/userdata /data ext4 noatime,nosuid,nodev,barrier=1,data=ordered,noauto_da_alloc wait,check,fileencryption=ice,quota,reservedsize=512M +/dev/block/bootdevice/by-name/userdata /data f2fs noatime,nosuid,nodev,discard wait,check,fileencryption=ice,quota +/dev/block/mmcblk0p1 /sdcard vfat nosuid,nodev wait +/dev/block/bootdevice/by-name/boot /boot emmc defaults defaults +/dev/block/bootdevice/by-name/misc /misc emmc defaults defaults diff --git a/recovery/root/sbin/adbd b/recovery/root/sbin/adbd deleted file mode 100755 index 15d8afd..0000000 Binary files a/recovery/root/sbin/adbd and /dev/null differ diff --git a/recovery/root/sbin/prepdecrypt.sh b/recovery/root/sbin/prepdecrypt.sh index 02a0edf..01809d6 100755 --- a/recovery/root/sbin/prepdecrypt.sh +++ b/recovery/root/sbin/prepdecrypt.sh @@ -30,6 +30,7 @@ syspath="/dev/block/bootdevice/by-name/system$suffix" mkdir /s mount -t ext4 -o ro "$syspath" /s +device_codename=$(getprop ro.boot.hardware) is_fastboot_twrp=$(getprop ro.boot.fastboot) if [ ! -z "$is_fastboot_twrp" ]; then osver=$(getprop ro.build.version.release_orig) diff --git a/system.prop b/system.prop index 444bc43..c4d060b 100644 --- a/system.prop +++ b/system.prop @@ -3,4 +3,3 @@ ro.product.board=sdm845 ro.board.platform=sdm845 ro.build.version.release=9 ro.build.version.security_patch=2025-12-31 -