E7544: PBRP-ify

Author: gitclone-url

Android.bp

@@ -6,9 +6,9 @@
 #
 
 PRODUCT_MAKEFILES := \
-    $(LOCAL_DIR)/twrp_E7544.mk
+    $(LOCAL_DIR)/omni_E7544.mk
 
 COMMON_LUNCH_CHOICES := \
-    twrp_E7544-user \
-    twrp_E7544-userdebug \
-    twrp_E7544-eng
+    omni_E7544-user \
+    omni_E7544-userdebug \
+    omni_E7544-eng

Android.mk

@@ -1,21 +1,19 @@
 #
-# Copyright (C) 2022 The Android Open Source Project
-# Copyright (C) 2022 SebaUbuntu's TWRP device tree generator
-#
+# Copyright (C) 2023 The Android Open Source Project
+# 
 # SPDX-License-Identifier: Apache-2.0
 #
 
 DEVICE_PATH := device/micromax/E7544
 
-# For building with minimal manifest
-ALLOW_MISSING_DEPENDENCIES := true
-
-
-# Enable virtual A/B OTA
-# $(call inherit-product, $(SRC_TARGET_DIR)/product/virtual_ab_ota.mk)
 
-# Installs gsi keys into ramdisk, to boot a developer GSI with verified boot.
-# $(call inherit-product, $(SRC_TARGET_DIR)/product/gsi_keys.mk)
+ALLOW_MISSING_DEPENDENCIES := true
+BUILD_BROKEN_DUP_RULES := true
+BUILD_BROKEN_USES_BUILD_COPY_HEADERS := true
+BUILD_BROKEN_PREBUILT_ELF_FILES := true
+BUILD_BROKEN_ELF_PREBUILT_PRODUCT_COPY_FILES := true
+BUILD_BROKEN_MISSING_REQUIRED_MODULES := true
+RELAX_USES_LIBRARY_CHECK=true
 
 # A/B
 ifeq ($(TARGET_IS_VAB),true)
@@ -24,6 +22,8 @@ AB_OTA_PARTITIONS += \
     vbmeta \
     vbmeta_system \
     vbmeta_vendor \
+    vbmeta_product \
+    vbmeta_system_ext \
     dtbo \
     boot \
     system \
@@ -35,7 +35,21 @@ endif
 # Recovery
 TARGET_NO_RECOVERY := true
 BOARD_USES_RECOVERY_AS_BOOT := true
-
+TARGET_RECOVERY_DEVICE_MODULES += \
+    libcap \
+    libion \
+    libxml2
+TW_RECOVERY_ADDITIONAL_RELINK_LIBRARY_FILES += \
+    $(TARGET_OUT_SHARED_LIBRARIES)/libcap.so \
+    $(TARGET_OUT_SHARED_LIBRARIES)/libion.so \
+    $(TARGET_OUT_SHARED_LIBRARIES)/libxml2.so
+    
+# Additional Libraries
+TARGET_RECOVERY_DEVICE_MODULES += \
+    libandroidicu 
+    $(OUT_DIR)/target/product/$(PRODUCT_DEVICE)/obj/SHARED_LIBRARIES/libandroidicu_intermediates/libandroidicu.so:$(TARGET_COPY_OUT_RECOVERY)/root/system/lib64/libandroidicu.so
+    
+    
 # Architecture
 TARGET_ARCH := arm64
 TARGET_ARCH_VARIANT := armv8-a
@@ -51,8 +65,10 @@ TARGET_2ND_CPU_ABI2 := armeabi
 TARGET_2ND_CPU_VARIANT := generic
 TARGET_2ND_CPU_VARIANT_RUNTIME := cortex-a55
 
-# APEX
-DEXPREOPT_GENERATE_APEX_IMAGE := true
+# 64-bit
+TARGET_SUPPORTS_64_BIT_APPS := true
+TARGET_IS_64_BIT := true
+TARGET_USES_64_BIT_BINDER := true
 
 # Bootloader
 TARGET_BOOTLOADER_BOARD_NAME := ums512_1h10
@@ -67,6 +83,7 @@ BOARD_KERNEL_CMDLINE := console=ttyS1,115200n8 buildvariant=user
 BOARD_KERNEL_PAGESIZE := 2048
 BOARD_RAMDISK_OFFSET := 0x05400000
 BOARD_KERNEL_TAGS_OFFSET := 0x00000100
+BOARD_DTB_OFFSET := 0x01f00000
 BOARD_MKBOOTIMG_ARGS += --header_version $(BOARD_BOOTIMG_HEADER_VERSION)
 BOARD_MKBOOTIMG_ARGS += --ramdisk_offset $(BOARD_RAMDISK_OFFSET)
 BOARD_MKBOOTIMG_ARGS += --tags_offset $(BOARD_KERNEL_TAGS_OFFSET)
@@ -79,9 +96,8 @@ TARGET_KERNEL_SOURCE := kernel/micromax/E7544
 TARGET_FORCE_PREBUILT_KERNEL := true
 ifeq ($(TARGET_FORCE_PREBUILT_KERNEL),true)
 TARGET_PREBUILT_KERNEL := $(DEVICE_PATH)/prebuilt/kernel
-TARGET_PREBUILT_DTB := $(DEVICE_PATH)/prebuilt/dtb.img
+TARGET_PREBUILT_DTB := $(DEVICE_PATH)/prebuilt/dtb
 BOARD_MKBOOTIMG_ARGS += --dtb $(TARGET_PREBUILT_DTB)
-BOARD_INCLUDE_DTB_IN_BOOTIMG := 
 endif
 
 # Partitions
@@ -90,18 +106,40 @@ BOARD_BOOTIMAGE_PARTITION_SIZE := 67108864
 BOARD_RECOVERYIMAGE_PARTITION_SIZE := 67108864
 BOARD_HAS_LARGE_FILESYSTEM := true
 BOARD_SYSTEMIMAGE_PARTITION_TYPE := ext4
-BOARD_USERDATAIMAGE_FILE_SYSTEM_TYPE := ext4
 BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4
+BOARD_PRODUCTIMAGE_FILE_SYSTEM_TYPE := ext4
+BOARD_SYSTEM_EXTIMAGE_FILE_SYSTEM_TYPE := ext4
 TARGET_COPY_OUT_VENDOR := vendor
 BOARD_SUPER_PARTITION_SIZE := 9126805504 # TODO: Fix hardcoded value
 BOARD_SUPER_PARTITION_GROUPS := micromax_dynamic_partitions
 BOARD_MICROMAX_DYNAMIC_PARTITIONS_PARTITION_LIST := system system_ext vendor product
 BOARD_MICROMAX_DYNAMIC_PARTITIONS_SIZE := 9122611200 # TODO: Fix hardcoded value
+BOARD_ROOT_EXTRA_SYMLINKS := \
+    /vendor/bt_firmware:/bt_firmware \
+    /mnt/vendor/socko:/socko \
+    /mnt/sdcard/:sdcrad \
+    /system/product/:product \
+    /system/system_ext/:system_ext 
+
+    
+# AVB
+BOARD_AVB_ENABLE := true
+BOARD_AVB_VBMETA_SYSTEM := system
+BOARD_AVB_BOOT_KEY_PATH := external/avb/test/data/testkey_rsa4096.pem
+BOARD_AVB_BOOT_ALGORITHM := SHA256_RSA4096
+BOARD_AVB_BOOT_ROLLBACK_INDEX := $(PLATFORM_SECURITY_PATCH_TIMESTAMP)
+BOARD_AVB_BOOT_ROLLBACK_INDEX_LOCATION := 2
 
 # UserIMG
 TARGET_USERIMAGES_USE_EXT4 := true
 TARGET_USERIMAGES_USE_F2FS := true
 
+# File systems
+BOARD_USERDATAIMAGE_FILE_SYSTEM_TYPE := f2fs
+
+# System as root
+BOARD_SUPPRESS_SECURE_ERASE := true
+
 # Partitions (listed in the file) to be wiped under recovery.
 TARGET_RECOVERY_WIPE := $(DEVICE_PATH)/recovery/root/system/etc/recovery.wipe
 
@@ -110,10 +148,7 @@ TARGET_USES_MKE2FS := true
 
 # Decryption
 TW_INCLUDE_CRYPTO := true
-TW_INCLUDE_CRYPTO_FBE := true
-TW_INCLUDE_FBE_METADATA_DECRYPT := true
 BOARD_USES_METADATA_PARTITION := true
-BOARD_USES_QCOM_FBE_DECRYPTION := true
 TW_USE_FSCRYPT_POLICY := 1
 
 # Platform
@@ -125,8 +160,9 @@ TARGET_NO_BOOTLOADER := false
 
 # Recovery
 TARGET_RECOVERY_PIXEL_FORMAT := RGBX_8888
-TARGET_USERIMAGES_USE_EXT4 := true
-TARGET_USERIMAGES_USE_F2FS := true
+
+# Properties
+TARGET_SYSTEM_PROP += $(DEVICE_PATH)/system.prop
 
 # Verified Boot
 BOARD_AVB_ENABLE := true
@@ -142,9 +178,28 @@ TW_THEME := portrait_hdpi
 TW_EXTRA_LANGUAGES := true
 TW_SCREEN_BLANK_ON_BOOT := true
 TW_INPUT_BLACKLIST := "hbtp_vm"
+TW_BRIGHTNESS_PATH := "/sys/devices/platform/backlight/backlight/sprd_backlight/brightness"
+TW_USE_TOOLBOX := true
+TW_INCLUDE_REPACKTOOLS := true
+TW_INCLUDE_FASTBOOTD := true
 TW_USE_TOOLBOX := true
 TW_INCLUDE_REPACKTOOLS := true
 TW_INCLUDE_FASTBOOTD := true
+RECOVERY_SDCARD_ON_DATA := true
+TW_USE_EXTERNAL_STORAGE := true
+TW_EXCLUDE_DEFAULT_USB_INIT := true
+TW_EXCLUDE_TWRPAPP := true
+TW_INCLUDE_NTFS_3G := true
+TW_NO_BIND_SYSTEM := true
+TW_NO_SCREEN_BLANK := true
+TW_SCREEN_BLANK_ON_BOOT := true
+TW_NO_SCREEN_TIMEOUT := true
+
+
+# resetprop and magiskboot
+TW_INCLUDE_RESETPROP := true
+TW_INCLUDE_REPACKTOOLS := true
+TW_INCLUDE_LIBRESETPROP := true
 
 # Security patch level
 VENDOR_SECURITY_PATCH := 2021-08-01
@@ -156,15 +211,26 @@ TARGET_USES_LOGD := true
 
 TARGET_RECOVERY_FSTAB := $(DEVICE_PATH)/recovery/root/system/etc/recovery.fstab
 
+# Workaround for error copying vendor files to recovery ramdisk
+BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4
+TARGET_COPY_OUT_VENDOR := vendor
+TARGET_COPY_OUT_PRODUCT := product
+TARGET_COPY_OUT_SYSTEM_EXT := system_ext
+
 # Metadata
 BOARD_USES_METADATA_PARTITION := true
-TW_INCLUDE_FBE_METADATA_DECRYPT := true
+BOARD_ROOT_EXTRA_FOLDERS += metadata
+BOARD_EXT4_SHARE_DUP_BLOCKS := true
 
-# Decryption
-TW_INCLUDE_CRYPTO := true
-TW_INCLUDE_CRYPTO_FBE := true
-BOARD_USES_QCOM_FBE_DECRYPTION := true
-TW_USE_FSCRYPT_POLICY := 1
+# PBRP Specific Build Flags
+PB_DISABLE_DEFAULT_TREBLE_COMP := false
+PB_DISABLE_DEFAULT_DM_VERITY := true
+PB_DEVICE_RATIO := "20:9"
+
+# Other flags
+TW_NO_LEGACY_PROPS := true
+TW_OVERRIDE_SYSTEM_PROPS := "ro.build.version.sdk"
+TW_NO_SCREEN_BLANK := true
 
 # Kernel module loading
-TW_LOAD_VENDOR_MODULES := "incrementalfs.ko kheaders.ko trace_irqsoff_bytedancy.ko trace_noschedule_bytedancy.ko trace_runqlat_bytedancy.ko"
+TW_LOAD_VENDOR_MODULES := "incrementalfs.ko kheaders.ko trace_irqsoff_bytedancy.ko trace_noschedule_bytedancy.ko trace_runqlat_bytedancy.ko"

AndroidProducts.mk

@@ -1,9 +1,17 @@
-# Android device tree for Micromax IN_2b (E7544)
+<h1 align="center">
+  <br>
+  <a href="https://pitchblackrecovery.com"><img src="https://raw.githubusercontent.com/shovon668/xda-template/r3/pbrp3-banner-xda.png" alt="Welcome to PitchBlack Recovery Project 👋"></a>
+  <br>
 
-The Micromax IN2B (Model_E7544) is a entry-level smartphone from Micromax.
-Micromax announced this device on July 30 2021 and released in August 06 2021
+# 𝗠𝗶𝗰𝗿𝗼𝗺𝗮𝘅 𝗜𝗡_𝟮𝗯 (𝗘𝟳𝟱𝟰𝟰) 𝗗𝗲𝘃𝗶𝗰𝗲 𝗧𝗿𝗲𝗲
+  𝔽𝕠𝕣 ℙ𝕚𝕥𝕔𝕙𝔹𝕝𝕒𝕔𝕜 ℝ𝕖𝕔𝕠𝕧𝕖𝕣𝕪 𝔹𝕦𝕚𝕝𝕕
 
-## Device specifications
+<img src="https://logos-download.com/wp-content/uploads/2016/06/Micromax_logo_orange_background.png"/>
+   
+ 𝑻𝒉𝒆 𝑴𝒊𝒄𝒓𝒐𝒎𝒂𝒙 𝑰𝑵𝟐𝑩 (𝑴𝒐𝒅𝒆𝒍_𝑬𝟕𝟓𝟒𝟒) 𝒊𝒔 𝒂 𝒆𝒏𝒕𝒓𝒚-𝒍𝒆𝒗𝒆𝒍 𝒔𝒎𝒂𝒓𝒕𝒑𝒉𝒐𝒏𝒆 𝒇𝒓𝒐𝒎  𝑴𝒊𝒄𝒓𝒐𝒎𝒂𝒙 𝑰𝒏𝒇𝒐𝒓𝒎𝒂𝒕𝒊𝒄𝒔. 𝑴𝒊𝒄𝒓𝒐𝒎𝒂𝒙 𝒂𝒏𝒏𝒐𝒖𝒏𝒄𝒆𝒅  𝒕𝒉𝒊𝒔 𝒅𝒆𝒗𝒊𝒄𝒆 𝒐𝒏 𝑱𝒖𝒍𝒚 𝟑𝟎 𝟐𝟎𝟐𝟏   𝒂𝒏𝒅 𝒓𝒆𝒍𝒆𝒂𝒔𝒆𝒅 𝒊𝒏 𝑨𝒖𝒈𝒖𝒔𝒕 𝟎𝟔 𝟐𝟎𝟐𝟏
+
+
+![](https://www.smartphonesbd.com/images/phones/micromax-in-2b.jpg)
 
 Basic   | Spec Sheet
 -------:|:-------------------------
@@ -26,15 +34,19 @@ SELFIE CAMERA Single | 5 MP, f/2.2 Features : HDR
 USB | USB Type-C 2.0, OTG
 Sensors | Fingerprint (rear-mounted), accelerometer, proximity
 SAR | 0.85 W/kg (head) / 1.13 W/kg (body) 
-## Device picture
-
-![](https://www.smartphonesbd.com/images/phones/micromax-in-2b.jpg)
+### Copyright
 
-```
-#
-# Copyright (C) 2022 The Android Open Source Project
-# Copyright (C) 2022 SebaUbuntu's TWRP device tree generator
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-```
+        
+        # Copyright (C) 2023 The PitchBlack Recovery 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.

BoardConfig.mk

@@ -0,0 +1,21 @@
+//
+// 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 {
+    name: "bootctrl.default",
+    defaults: ["bootctrl_hal_defaults"],
+    static_libs: ["libgptutils"],
+}

README.md

@@ -18,37 +18,49 @@ AB_OTA_POSTINSTALL_CONFIG += \
     FILESYSTEM_TYPE_system=ext4 \
     POSTINSTALL_OPTIONAL_system=true
 
-# Boot control HAL
+# f2fs utilities
 PRODUCT_PACKAGES += \
-    android.hardware.boot@1.0-impl \
-    android.hardware.boot@1.0-impl.recovery \
-    android.hardware.boot@1.0-service
+    sg_write_buffer \
+    f2fs_io \
+    check_f2fs
 
+# Userdata checkpoint
+PRODUCT_PACKAGES += \
+    checkpoint_gc
+
+AB_OTA_POSTINSTALL_CONFIG += \
+    RUN_POSTINSTALL_vendor=true \
+    POSTINSTALL_PATH_vendor=bin/checkpoint_gc \
+    FILESYSTEM_TYPE_vendor=ext4 \
+    POSTINSTALL_OPTIONAL_vendor=true    
+
 # Health
 PRODUCT_PACKAGES += \
     android.hardware.health@2.1-impl \
-    android.hardware.health@2.1-impl.recovery \
     android.hardware.health@2.1-service
 
+# bootctrl HAL    
 PRODUCT_PACKAGES += \
-    bootctrl.ums512 \
+    bootctrl.default \
+    bootctrl.unisoc \
     bootctrl.ums512.recovery
-
+ 
 PRODUCT_PACKAGES += \
     otapreopt_script \
     cppreopts.sh \
     update_engine \
     update_verifier \
-    update_engine_sideload
+    update_engine_sideload \
+    checkpoint_gc 
 
+PRODUCT_PACKAGES_DEBUG += \
+    bootctl    
+    
 # Fastbootd
 PRODUCT_PACKAGES += \
     fastbootd \
     android.hardware.fastboot@1.0-impl-mock \
     android.hardware.fastboot@1.0-impl-mock.recovery
 
-
-# QCOM Decryption
-PRODUCT_PACKAGES += \
-    qcom_decrypt \
-    qcom_decrypt_fbe
+# Hidl Service
+PRODUCT_ENFORCE_VINTF_MANIFEST := true    

bootctrl/Android.bp

@@ -59,3 +59,4 @@ setup_vendor "${DEVICE}" "${VENDOR}" "${ANDROID_ROOT}" false "${CLEAN_VENDOR}"
 extract "${MY_DIR}/proprietary-files.txt" "${SRC}" "${KANG}" --section "${SECTION}"
 
 "${MY_DIR}/setup-makefiles.sh"
+