recovery: adapt for android S (12.1)

Signed-off-by: Bharat Dev Burman <bharat.singh7924@gmail.com>

Android.mk

@@ -1,5 +1,5 @@
 LOCAL_PATH := $(call my-dir)
 
-ifeq ($(TARGET_DEVICE),RMX3241)
+ifeq ($(TARGET_DEVICE),apollob)
 include $(call all-subdir-makefiles,$(LOCAL_PATH))
 endif

AndroidProducts.mk

@@ -16,6 +16,6 @@
 
 PRODUCT_SOONG_NAMESPACES += $(LOCAL_DIR)/init
 
-PRODUCT_MAKEFILES := $(LOCAL_DIR)/twrp_RMX3241.mk
+PRODUCT_MAKEFILES := $(LOCAL_DIR)/twrp_apollob.mk
 
-COMMON_LUNCH_CHOICES := twrp_RMX3241-eng
+COMMON_LUNCH_CHOICES := twrp_apollob-eng

BoardConfig.mk

@@ -14,7 +14,8 @@
 # limitations under the License.
 #
 
-DEVICE_PATH := device/realme/RMX3241
+ALLOW_MISSING_DEPENDENCIES=true
+DEVICE_PATH := device/realme/apollob
 
 # Architecture
 TARGET_ARCH := arm64
@@ -56,12 +57,12 @@ BOARD_BOOTIMG_HEADER_VERSION := 2
 
 TARGET_KERNEL_ARCH := arm64
 TARGET_KERNEL_HEADER_ARCH := arm64
-TARGET_PREBUILT_KERNEL := $(DEVICE_PATH)/prebuilt/kernel
-
-BOARD_PREBUILT_DTBIMAGE_DIR := $(DEVICE_PATH)/prebuilt/dtb
-BOARD_PREBUILT_DTBOIMAGE := $(DEVICE_PATH)/prebuilt/recovery_dtbo
+TARGET_KERNEL_SOURCE := kernel/realme/apollob
+TARGET_KERNEL_CONFIG := apollob_defconfig
+TARGET_KERNEL_CLANG_COMPILE := true
 
 BOARD_INCLUDE_RECOVERY_DTBO := true
+BOARD_PREBUILT_DTBOIMAGE := $(DEVICE_PATH)/prebuilt/recovery_dtbo
 BOARD_INCLUDE_DTB_IN_BOOTIMG := true
 
 BOARD_MKBOOTIMG_ARGS := --ramdisk_offset $(BOARD_RAMDISK_OFFSET)
@@ -70,12 +71,12 @@ BOARD_MKBOOTIMG_ARGS += --header_version $(BOARD_BOOTIMG_HEADER_VERSION)
 BOARD_MKBOOTIMG_ARGS += --second_offset $(BOARD_KERNEL_SECOND_OFFSET)
 BOARD_MKBOOTIMG_ARGS += --dtb_offset $(BOARD_DTB_OFFSET)
 
-# Init
-TARGET_INIT_VENDOR_LIB := libinit_realme6833
-TARGET_RECOVERY_DEVICE_MODULES := libinit_realme6833
-
 # Assert
-TARGET_OTA_ASSERT_DEVICE := RMX3241,RMX3242
+TARGET_OTA_ASSERT_DEVICE := RMX3241,RMX3242,RE513CL1,apollob
+
+# Init
+TARGET_INIT_VENDOR_LIB := libinit_apollob
+TARGET_RECOVERY_DEVICE_MODULES := libinit_apollob
 
 # Crypto
 PLATFORM_SECURITY_PATCH := 2099-12-31
@@ -85,20 +86,7 @@ VENDOR_SECURITY_PATCH := 2099-12-31
 # Android Verified Boot
 BOARD_AVB_ENABLE := true
 
-BOARD_AVB_MAKE_VBMETA_IMAGE_ARGS := --set_hashtree_disabled_flag
-BOARD_AVB_MAKE_VBMETA_IMAGE_ARGS := --flags 2
-
-BOARD_AVB_VBMETA_SYSTEM := system 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 := 2
-
-BOARD_AVB_VBMETA_VENDOR := vendor odm
-BOARD_AVB_VBMETA_VENDOR_KEY_PATH := external/avb/test/data/testkey_rsa2048.pem
-BOARD_AVB_VBMETA_VENDOR_ALGORITHM := SHA256_RSA2048
-BOARD_AVB_VBMETA_VENDOR_ROLLBACK_INDEX := $(PLATFORM_SECURITY_PATCH_TIMESTAMP)
-BOARD_AVB_VBMETA_VENDOR_ROLLBACK_INDEX_LOCATION := 4
+BOARD_AVB_MAKE_VBMETA_IMAGE_ARGS := --flags 3
 
 BOARD_AVB_RECOVERY_KEY_PATH := external/avb/test/data/testkey_rsa2048.pem
 BOARD_AVB_RECOVERY_ALGORITHM := SHA256_RSA2048
@@ -137,6 +125,7 @@ TARGET_SYSTEM_PROP := $(DEVICE_PATH)/system.prop
 BOARD_USES_METADATA_PARTITION := true
 
 # Recovery
+BUILD_BROKEN_ELF_PREBUILT_PRODUCT_COPY_FILES := true
 BOARD_CHARGER_DISABLE_INIT_BLANK := true
 TARGET_RECOVERY_PIXEL_FORMAT := "RGBX_8888"
 RECOVERY_SDCARD_ON_DATA := true

README.md

@@ -11,7 +11,7 @@ To build:
 
 1. Then prepare
 ```bash
-lunch twrp_RMX3241-eng
+lunch twrp_apollob-eng
 ```
 
 2. Don't forget this

init/Android.bp

@@ -15,13 +15,13 @@
 //
 
 cc_library_static {
-    name: "libinit_realme6833",
+    name: "libinit_apollob",
     recovery_available: true,
     include_dirs: [
-        "system/core/base/include",
+        "system/libbase/include",
         "system/core/init",
     ],
-    srcs: ["init_realme6833.cpp"],
+    srcs: ["init_apollob.cc"],
     cflags: [
         "-Wall",
         "-Werror",

twrp_RMX3241.mk → twrp_apollob.mk

@@ -37,8 +37,8 @@ PRODUCT_PACKAGES += \
     libion.recovery
 
 ## Device identifier. This must come after all inclusions
-PRODUCT_DEVICE := RMX3241
-PRODUCT_NAME := twrp_RMX3241
+PRODUCT_DEVICE := apollob
+PRODUCT_NAME := twrp_apollob
 PRODUCT_BRAND := realme
 PRODUCT_MODEL := RM6833
 PRODUCT_MANUFACTURER := realme