update

.github/workflows/Recovery Build.yml

@@ -81,7 +81,7 @@ jobs:
 
     # You might want to Checkout your repo first, but not mandatory
     - name: Check Out
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
     # Cleanup The Actions Workspace Using Custom Composite Run Actions
     - name: Cleanup
       uses: rokibhasansagar/slimhub_actions@main
@@ -168,7 +168,7 @@ jobs:
       working-directory: ${{ steps.pwd.outputs.workspace-folder }}
 
     - name: Upload to Release
-      uses: softprops/action-gh-release@v1
+      uses: softprops/action-gh-release@v2
       with:
         files: | 
           workspace/out/target/product/${{ github.event.inputs.DEVICE_NAME }}/${{ github.event.inputs.BUILD_TARGET }}.img

Android.bp

@@ -6,4 +6,5 @@
 //
 
 soong_namespace {
-}
+    imports: ["hardware/qcom-caf/bootctrl"],
+}

BoardConfig.mk

@@ -7,234 +7,118 @@
 
 DEVICE_PATH := device/xiaomi/ziyi
 
-BOARD_SYSTEMSDK_VERSIONS := 31
-
-# For building with minimal manifest
-ALLOW_MISSING_DEPENDENCIES := true
-BUILD_BROKEN_ELF_PREBUILT_PRODUCT_COPY_FILES := true
-BUILD_BROKEN_PREBUILT_ELF_FILES := true
-BUILD_BROKEN_DUP_RULES := true
-BUILD_BROKEN_USES_NETWORK := true
-
 # Architecture
-TARGET_ARCH := arm64
-TARGET_ARCH_VARIANT := armv8-a
-TARGET_CPU_ABI := arm64-v8a
-TARGET_CPU_ABI2 := 
-TARGET_CPU_VARIANT := generic
+TARGET_ARCH                := arm64
+TARGET_ARCH_VARIANT        := armv8-a
+TARGET_CPU_ABI             := arm64-v8a
+TARGET_CPU_ABI2            := 
+TARGET_CPU_VARIANT         := generic
 TARGET_CPU_VARIANT_RUNTIME := kryo300
 
-TARGET_2ND_ARCH := arm
-TARGET_2ND_ARCH_VARIANT := armv7-a-neon
-TARGET_2ND_CPU_ABI := armeabi-v7a
-TARGET_2ND_CPU_ABI2 := armeabi
-TARGET_2ND_CPU_VARIANT := generic
+TARGET_2ND_ARCH            := arm
+TARGET_2ND_ARCH_VARIANT    := armv7-a-neon
+TARGET_2ND_CPU_ABI         := armeabi-v7a
+TARGET_2ND_CPU_ABI2        := armeabi
+TARGET_2ND_CPU_VARIANT     := generic
 TARGET_2ND_CPU_VARIANT_RUNTIME := cortex-a75
 
-# A/B
-#BOARD_EXCLUDE_KERNEL_FROM_RECOVERY_IMAGE := true
-BOARD_BUILD_SYSTEM_ROOT_IMAGE := false
-AB_OTA_UPDATER := true
-AB_OTA_PARTITIONS += \
-    boot \
-    dtbo \
-    odm \
-    product \
-    system \
-    system_ext \
-    vbmeta \
-    vbmeta_system \
-    vendor \
-    vendor_dlkm \
-    vendor_boot
-
-# Avb
-BOARD_AVB_ENABLE := true
-BOARD_AVB_MAKE_VBMETA_IMAGE_ARGS += --flags 3
-BOARD_AVB_VBMETA_SYSTEM := system system_ext product
-BOARD_AVB_VBMETA_SYSTEM_KEY_PATH := external/avb/test/data/testkey_rsa2048.pem
-BOARD_AVB_VBMETA_SYSTEM_ALGORITHM := SHA256_RSA2048
-BOARD_AVB_VBMETA_SYSTEM_ROLLBACK_INDEX := $(PLATFORM_SECURITY_PATCH_TIMESTAMP)
-BOARD_AVB_VBMETA_SYSTEM_ROLLBACK_INDEX_LOCATION := 1
+# Bootloader
+TARGET_NO_BOOTLOADER          := false
+TARGET_BOOTLOADER_BOARD_NAME  := taro
+TARGET_USES_UEFI              := true
 
-# APEX
-DEXPREOPT_GENERATE_APEX_IMAGE := true
+# Platform
+TARGET_BOARD_PLATFORM         := taro
+TARGET_BOARD_PLATFORM_GPU     := qcom-adreno644											   
+BOARD_USES_QCOM_HARDWARE      := true
+QCOM_BOARD_PLATFORMS          += taro
+TARGET_BOARD_PLATFORM         := taro
+PRODUCT_PLATFORM              := taro
 
-# Bootloader
-TARGET_BOOTLOADER_BOARD_NAME := taro
-TARGET_NO_BOOTLOADER := false
-TARGET_USES_UEFI := true
-TARGET_USES_REMOTEPROC := true
-TARGET_NO_KERNEL := false
-BOARD_RAMDISK_USE_LZ4 := true
+# Kernel
+BOARD_KERNEL_PAGESIZE       := 4096
+TARGET_KERNEL_ARCH          := arm64
+TARGET_KERNEL_HEADER_ARCH   := arm64
+BOARD_KERNEL_IMAGE_NAME     := Image
+BOARD_BOOT_HEADER_VERSION   := 4
+TARGET_KERNEL_CLANG_COMPILE := true
+TARGET_PREBUILT_KERNEL      := $(DEVICE_PATH)/prebuilt/kernel
+BOARD_MKBOOTIMG_ARGS        += --header_version $(BOARD_BOOT_HEADER_VERSION)
+BOARD_MKBOOTIMG_ARGS        += --pagesize $(BOARD_KERNEL_PAGESIZE)
 
-# Build
-BUILD_BROKEN_NINJA_USES_ENV_VARS += SDCLANG_AE_CONFIG SDCLANG_CONFIG SDCLANG_SA_ENABLE
-BUILD_BROKEN_NINJA_USES_ENV_VARS += RTIC_MPGEN
-BUILD_BROKEN_USES_BUILD_HOST_SHARED_LIBRARY := true
-BUILD_BROKEN_USES_BUILD_HOST_STATIC_LIBRARY := true
-BUILD_BROKEN_USES_BUILD_HOST_EXECUTABLE := true
-BUILD_BROKEN_USES_BUILD_COPY_HEADERS := true
+# GSI && GKI
+BOARD_USES_GENERIC_KERNEL_IMAGE          := true
+BOARD_EXCLUDE_KERNEL_FROM_RECOVERY_IMAGE := true
 
-ENABLE_CPUSETS := true
-ENABLE_SCHEDBOOST := true
-TARGET_PLATFORM_DEVICE_BASE := /devices/soc/
 
-# Crypto
-TW_INCLUDE_CRYPTO := true
-TW_INCLUDE_CRYPTO_FBE := true
-TW_INCLUDE_FBE_METADATA_DECRYPT := true
-BOARD_USES_QCOM_FBE_DECRYPTION := true
-BOARD_USES_METADATA_PARTITION := true
-TW_USE_FSCRYPT_POLICY := 2
-PLATFORM_VERSION := 99.87.36
-PLATFORM_VERSION_LAST_STABLE := $(PLATFORM_VERSION)
-PLATFORM_SECURITY_PATCH := 2099-12-31
-VENDOR_SECURITY_PATCH := $(PLATFORM_SECURITY_PATCH)
-BOOT_SECURITY_PATCH := $(PLATFORM_SECURITY_PATCH)
-
-# File systems
-TARGET_USERIMAGES_USE_EXT4 := true
-TARGET_USERIMAGES_USE_F2FS := true
-BOARD_USES_VENDOR_DLKMIMAGE := true
+# Use LZ4 Ramdisk compression instead of GZIP
+BOARD_RAMDISK_USE_LZ4 := true
 
-# Kernel
-TARGET_KERNEL_ARCH := arm64
-TARGET_KERNEL_HEADER_ARCH := arm64
-TARGET_KERNEL_CLANG_COMPILE := true
+# Power
+ENABLE_CPUSETS    := true
+ENABLE_SCHEDBOOST := true
 
-BOARD_BOOT_HEADER_VERSION := 4
-BOARD_MKBOOTIMG_ARGS += --header_version $(BOARD_BOOT_HEADER_VERSION)
+# Verified Boot
+BOARD_AVB_ENABLE := true
+BOARD_AVB_VBMETA_SYSTEM := system system_ext product
+BOARD_AVB_VBMETA_SYSTEM_KEY_PATH := external/avb/test/data/testkey_rsa2048.pem
+BOARD_AVB_VBMETA_SYSTEM_ALGORITHM := SHA256_RSA2048
+BOARD_AVB_VBMETA_SYSTEM_ROLLBACK_INDEX := $(PLATFORM_SECURITY_PATCH_TIMESTAMP)
+BOARD_AVB_VBMETA_SYSTEM_ROLLBACK_INDEX_LOCATION := 1
 
-TARGET_COMPILE_WITH_MSM_KERNEL := false
-BOARD_EXCLUDE_KERNEL_FROM_RECOVERY_IMAGE := true
-BOARD_KERNEL_IMAGE_NAME := Image
-TARGET_PREBUILT_KERNEL := $(DEVICE_PATH)/prebuilt/kernel
-
-BOARD_KERNEL_BASE := 0x00000000
-BOARD_KERNEL_PAGESIZE := 4096
-BOARD_KERNEL_TAGS_OFFSET := 0x00000100
-BOARD_RAMDISK_OFFSET := 0x01000000
-BOARD_MKBOOTIMG_ARGS += --pagesize $(BOARD_KERNEL_PAGESIZE)
-
-BOARD_KERNEL_CMDLINE := video=vfb:640x400,bpp=32,memsize=3072000
-BOARD_KERNEL_CMDLINE += console=ttyMSM0,115200n8 earlycon msm_geni_serial.con_enabled=1 androidboot.selinux=permissive
-BOARD_BOOTCONFIG := androidboot.hardware=qcom androidboot.memcg=1 androidboot.usbcontroller=a600000.dwc3
-BOARD_BOOTCONFIG += androidboot.console=ttyMSM0
-
-# Kernel - prebuilt
-TARGET_FORCE_PREBUILT_KERNEL := false
-ifeq ($(TARGET_FORCE_PREBUILT_KERNEL),true)
-TARGET_PREBUILT_KERNEL := $(DEVICE_PATH)/prebuilt/kernel
-endif
+# Allow for building with minimal manifest
+ALLOW_MISSING_DEPENDENCIES := true
+BUILD_BROKEN_USES_NETWORK := true
+BUILD_BROKEN_DUP_RULES := true
+BUILD_BROKEN_ELF_PREBUILT_PRODUCT_COPY_FILES := true
+BUILD_BROKEN_MISSING_REQUIRED_MODULES := true
+
+# VNDK Treble
+BOARD_VNDK_VERSION := current
 
 # Partitions
-BOARD_BOOTIMAGE_PARTITION_SIZE := 201326592
+BOARD_FLASH_BLOCK_SIZE                    := 262144
+BOARD_RECOVERYIMAGE_PARTITION_SIZE        := 104857600
+BOARD_DTBOIMG_PARTITION_SIZE              := 25165824
+BOARD_BOOTIMAGE_PARTITION_SIZE            := 201326592
 BOARD_KERNEL-GKI_BOOTIMAGE_PARTITION_SIZE := $(BOARD_BOOTIMAGE_PARTITION_SIZE)
-BOARD_VENDOR_BOOTIMAGE_PARTITION_SIZE := 100663296
-BOARD_USERDATAIMAGE_PARTITION_SIZE := 239033364480
-BOARD_PERSISTIMAGE_PARTITION_SIZE := 67108864
-BOARD_METADATAIMAGE_PARTITION_SIZE := 16777216
-BOARD_DTBOIMG_PARTITION_SIZE := 25165824
-BOARD_FLASH_BLOCK_SIZE := 262144 # (BOARD_KERNEL_PAGESIZE * 64)
-
-BOARD_SUPER_PARTITION_SIZE := 9126805504
-BOARD_SUPER_PARTITION_GROUPS := qti_dynamic_partitions
-BOARD_QTI_DYNAMIC_PARTITIONS_SIZE := 9122611200
-BOARD_QTI_DYNAMIC_PARTITIONS_PARTITION_LIST := system system_ext product vendor vendor_dlkm odm
-BOARD_RECOVERYIMAGE_PARTITION_SIZE := 104857600
-
-TARGET_COPY_OUT_ODM := odm
-TARGET_COPY_OUT_VENDOR := vendor
-TARGET_COPY_OUT_VENDOR_DLKM := vendor_dlkm
+BOARD_USERDATAIMAGE_PARTITION_SIZE        := 239033364480
+BOARD_PERSISTIMAGE_PARTITION_SIZE         := 67108864
+BOARD_METADATAIMAGE_PARTITION_SIZE        := 16777216
+BOARD_VENDOR_BOOTIMAGE_PARTITION_SIZE     := 100663296
 
-BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED := true
+BOARD_USES_METADATA_PARTITION := true
+BOARD_USES_VENDOR_DLKMIMAGE   := true
+BOARD_USES_SYSTEM_EXTIMAGE    := true
 
+# Dynamic Partitions
+BOARD_SUPER_PARTITION_SIZE        := 9126805504
+BOARD_SUPER_PARTITION_GROUPS      := qti_dynamic_partitions
+BOARD_QTI_DYNAMIC_PARTITIONS_SIZE := 9122611200
+BOARD_QTI_DYNAMIC_PARTITIONS_PARTITION_LIST += \
+	system \
+	system_ext \
+	product \
+	vendor \
+	vendor_dlkm \
+	odm
+
+BOARD_PARTITION_LIST := $(call to-upper, $(BOARD_QTI_DYNAMIC_PARTITIONS_PARTITION_LIST))
+$(foreach p, $(BOARD_PARTITION_LIST), $(eval BOARD_$(p)IMAGE_FILE_SYSTEM_TYPE := erofs))
+$(foreach p, $(BOARD_PARTITION_LIST), $(eval TARGET_COPY_OUT_$(p) := $(call to-lower, $(p))))
+
+# Filesystems
+TARGET_USERIMAGES_USE_EXT4           := true
+TARGET_USERIMAGES_USE_F2FS           := true
+TARGET_USES_MKE2FS                   := true
+BOARD_HAS_LARGE_FILESYSTEM           := true
 BOARD_USERDATAIMAGE_FILE_SYSTEM_TYPE := f2fs
-BOARD_VENDOR_DLKMIMAGE_FILE_SYSTEM_TYPE := erofs
-BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := erofs
-BOARD_ODMIMAGE_FILE_SYSTEM_TYPE := erofs
-BOARD_SYSTEMIMAGE_PARTITION_TYPE := erofs
 
-# Properties
+# System Properties
 TARGET_SYSTEM_PROP += $(DEVICE_PATH)/system.prop
 
-# System as root
-BOARD_ROOT_EXTRA_FOLDERS := bluetooth dsp firmware persist
-BOARD_SUPPRESS_SECURE_ERASE := true
-
-# Platform
-BOARD_USES_QCOM_HARDWARE := true
-QCOM_BOARD_PLATFORMS += taro
-TARGET_BOARD_PLATFORM := taro
-PRODUCT_PLATFORM := taro
-TARGET_BOARD_PLATFORM_GPU := qcom-adreno644
-
 # Recovery
-BOARD_HAS_LARGE_FILESYSTEM := true
-TARGET_RECOVERY_DEVICE_MODULES += \
-    android.hidl.base@1.0 \
-    bootctrl.$(TARGET_BOARD_PLATFORM).recovery \
-    libion
 TARGET_RECOVERY_PIXEL_FORMAT := "RGBX_8888"
 TARGET_RECOVERY_FSTAB := $(DEVICE_PATH)/recovery/root/system/etc/recovery.fstab
-TW_RECOVERY_ADDITIONAL_RELINK_LIBRARY_FILES += \
-    $(TARGET_OUT_SHARED_LIBRARIES)/android.hidl.base@1.0.so \
-RECOVERY_LIBRARY_SOURCE_FILES += \
-    $(TARGET_OUT_SHARED_LIBRARIES)/libion.so
-
-# Tool
-TW_INCLUDE_REPACKTOOLS := true
-TW_INCLUDE_RESETPROP := true
-TW_INCLUDE_LIBRESETPROP := true
-
-# Debug
-TARGET_USES_LOGD := true
-TWRP_INCLUDE_LOGCAT := true
-
-# FastbootD
-TW_INCLUDE_FASTBOOTD := true
-
-# TWRP Configuration
-TW_INCLUDE_RESETPROP := true
-TW_NO_FLASH_CURRENT_TWRP := true
-TW_THEME := portrait_hdpi
-TW_FRAMERATE := 60
-RECOVERY_SDCARD_ON_DATA := true
 TARGET_RECOVERY_QCOM_RTC_FIX := true
-TW_EXCLUDE_DEFAULT_USB_INIT := true
-TW_INCLUDE_NTFS_3G := true
-TW_NO_EXFAT_FUSE := true
-TW_USE_TOOLBOX := true
-TARGET_USES_MKE2FS := true
-TW_INCLUDE_FUSE_EXFAT := true
-TW_INCLUDE_FUSE_NTFS := true
-TW_INPUT_BLACKLIST := "hbtp_vm"
-TW_BRIGHTNESS_PATH := "/sys/class/backlight/panel0-backlight/brightness"
-TW_MAX_BRIGHTNESS := 2047
-TW_EXTRA_LANGUAGES := true
-TW_DEFAULT_LANGUAGE := ru
-TW_DEFAULT_BRIGHTNESS := 204
-TW_Y_OFFSET := 99
-TW_H_OFFSET := -99
-TW_EXCLUDE_APEX := true
-TW_HAS_EDL_MODE := true
-TW_BACKUP_EXCLUSIONS := /data/fonts
-TW_LOAD_VENDOR_BOOT_MODULES := true
-
-# Haptic
-TW_SUPPORT_INPUT_AIDL_HAPTICS := true
-TW_SUPPORT_INPUT_AIDL_HAPTICS_FQNAME := "IVibrator/vibratorfeature"
-TW_SUPPORT_INPUT_AIDL_HAPTICS_FIX_OFF := true
-TW_USE_SERIALNO_PROPERTY_FOR_DEVICE_ID := true
-
-TW_LOAD_VENDOR_MODULES := "adsp_loader_dlkm.ko qti_battery_charger.ko synaptics_tcm_core_module.ko haptic.ko swr_haptics_dlkm.ko goodix_core.ko focaltech_fps.ko aw882xx_dlkm.ko aw88179_178a.ko"
-TW_NO_SCREEN_BLANK := true
-
-# Namespace definition for librecovery_updater
-SOONG_CONFIG_NAMESPACES += ufsbsg
-SOONG_CONFIG_ufsbsg += ufsframework
-SOONG_CONFIG_ufsbsg_ufsframework := bsg
-
-# The path to a temperature sensor
-TW_CUSTOM_CPU_TEMP_PATH := "/sys/devices/virtual/thermal/thermal_zone50/temp"
+TARGET_USES_LOGD := true

bootctrl/Android.bp

@@ -0,0 +1,30 @@
+//
+// Copyright (C) 2023 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+
+cc_library_shared {
+    name: "android.hardware.boot@1.1-impl-qti",
+    stem: "android.hardware.boot@1.0-impl-1.1-qti",
+    defaults: ["android.hardware.boot@1.1-impl-qti_defaults"],
+    static_libs: ["libgptutils-sg.ziyi"],
+}
+
+cc_library_shared {
+    name: "android.hardware.boot@1.2-impl-qti",
+    stem: "android.hardware.boot@1.0-impl-1.2-qti",
+    defaults: ["android.hardware.boot@1.2-impl-qti_defaults"],
+    static_libs: ["libgptutils-bsg.ziyi"],
+}