From c9a52a4c3a90bc0ec8720574576014c6c2cbd318 Mon Sep 17 00:00:00 2001
From: xunmod <116288337+xunmod@users.noreply.github.com>
Date: Sun, 4 Feb 2024 18:07:50 +0800
Subject: [PATCH] Update

---
 .github/twrp.patch          | 23 +++++++++++++++++++++++
 .github/twrp_gdb.patch      | 15 ---------------
 .github/workflows/build.yml | 33 ++++++++++++++++-----------------
 recovery/twrp.mk            |  7 ++++---
 4 files changed, 43 insertions(+), 35 deletions(-)
 create mode 100644 .github/twrp.patch
 delete mode 100644 .github/twrp_gdb.patch

diff --git a/.github/twrp.patch b/.github/twrp.patch
new file mode 100644
index 0000000..a581fc5
--- /dev/null
+++ b/.github/twrp.patch
@@ -0,0 +1,23 @@
+diff -uprN a/bootable/recovery/Android.mk b/bootable/recovery/Android.mk
+--- a/bootable/recovery/Android.mk	2024-02-04 18:04:00.000000000 +0800
++++ b/bootable/recovery/Android.mk	2024-02-04 18:05:00.000000000 +0800
+@@ -621,6 +621,11 @@ LOCAL_POST_INSTALL_CMD += \
+     sed -i "s/{themeversion}/$(TW_THEME_VERSION)/" $(TARGET_RECOVERY_ROOT_OUT)$(TWRES_PATH)splash.xml; \
+     sed -i "s/{themeversion}/$(TW_THEME_VERSION)/" $(TARGET_RECOVERY_ROOT_OUT)$(TWRES_PATH)ui.xml;
+ 
++# Debug
++LOCAL_CFLAGS += -g
++LOCAL_CPPFLAGS += -g
++LOCAL_STRIP_MODULE := false
++
+ include $(BUILD_EXECUTABLE)
+ 
+ # Symlink for file_contexts
+@@ -925,6 +930,7 @@ endif
+ include $(commands_TWRP_local_path)/injecttwrp/Android.mk \
+     $(commands_TWRP_local_path)/htcdumlock/Android.mk \
+     $(commands_TWRP_local_path)/gui/Android.mk \
++    $(commands_TWRP_local_path)/applypatch/Android.mk \
+     $(commands_TWRP_local_path)/mmcutils/Android.mk \
+     $(commands_TWRP_local_path)/bmlutils/Android.mk \
+     $(commands_TWRP_local_path)/prebuilt/Android.mk \
diff --git a/.github/twrp_gdb.patch b/.github/twrp_gdb.patch
deleted file mode 100644
index 3f1a636..0000000
--- a/.github/twrp_gdb.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -uprN a/bootable/recovery/Android.mk b/bootable/recovery/Android.mk
---- a/bootable/recovery/Android.mk	2024-02-02 12:48:29.600442691 +0800
-+++ b/bootable/recovery/Android.mk	2024-02-02 12:53:05.844329099 +0800
-@@ -78,6 +78,11 @@ LOCAL_SRC_FILES := \
-     twrpAdbBuFifo.cpp \
-     twrpRepacker.cpp
-
-+# Debug
-+LOCAL_CFLAGS += -g
-+LOCAL_CPPFLAGS += -g
-+LOCAL_STRIP_MODULE := false
-+
- ifneq ($(TARGET_RECOVERY_REBOOT_SRC),)
-   LOCAL_SRC_FILES += $(TARGET_RECOVERY_REBOOT_SRC)
- endif
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 7805516..54a1953 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -41,8 +41,7 @@ jobs:
           repo sync -c -f --no-tags --no-clone-bundle -j16
           rm -rf .repo/project-objects/platform .repo/project-objects/*-* || true
           rm -r device/softwinner/octopus-ibt
-          curl https://github.com/xunmod/android_device_ONDA_octopus-ibt/raw/lollipop/.github/twrp_gdb.patch | patch -p1 -
-          sed '$iinclude $(commands_TWRP_local_path)/apply_patch/Android.mk' bootable/recovery/Android.mk | tee bootable/recovery/Android.mk
+          curl https://github.com/xunmod/android_device_ONDA_octopus-ibt/raw/lollipop/.github/twrp.patch | patch -p1 -
       - name: Build
         shell: bash
         run: |
@@ -59,18 +58,18 @@ jobs:
         with:
           name: Images
           path: 'images.tar.gz'
-#      - name: Setup tmate session
-#        if: ${{ failure() || inputs.enable_ssh }}
-#        run: |
-#          wget https://github.com/tmate-io/tmate/releases/download/2.4.0/tmate-2.4.0-static-linux-amd64.tar.xz
-#          tar -tf tmate-2.4.0-static-linux-amd64.tar.xz
-#          sudo chmod +x tmate-2.4.0-static-linux-amd64/tmate
-#          tmate-2.4.0-static-linux-amd64/tmate
-#          cat << EOF >> tmate_keeper
-#          while true
-#          do
-#          sleep 1800
-#          done
-#          EOF
-#          chmod +x tmate_keeper
-#          ./tmate_keeper
+      - name: Setup tmate session
+        if: ${{ failure() || inputs.enable_ssh }}
+        run: |
+          wget https://github.com/tmate-io/tmate/releases/download/2.4.0/tmate-2.4.0-static-linux-amd64.tar.xz
+          tar -tf tmate-2.4.0-static-linux-amd64.tar.xz
+          sudo chmod +x tmate-2.4.0-static-linux-amd64/tmate
+          tmate-2.4.0-static-linux-amd64/tmate
+          cat << EOF >> tmate_keeper
+          while true
+          do
+          sleep 1800
+          done
+          EOF
+          chmod +x tmate_keeper
+          ./tmate_keeper
diff --git a/recovery/twrp.mk b/recovery/twrp.mk
index 4e5e24d..df94bed 100644
--- a/recovery/twrp.mk
+++ b/recovery/twrp.mk
@@ -22,13 +22,14 @@ TARGET_SCREEN_HEIGHT := 720
 TW_SCREEN_BLANK_ON_BOOT := true
 BOARD_SUPPRESS_SECURE_ERASE := true
 TW_DEFAULT_EXTERNAL_STORAGE := false
+TW_FORCE_USE_BUSYBOX := true
 TW_INCLUDE_FB2PNG := true
-TW_INCLUDE_FUSE_EXFAT := true
 TWRP_INCLUDE_LOGCAT := true
 TW_INCLUDE_CRYPTO := true
-TW_INCLUDE_NANO := true
-TW_INCLUDE_SUPERSU := true
+TW_CRYPTO_USE_SYSTEM_VOLD := true
+TW_INCLUDE_NTFS_3G := true
 TW_DEFAULT_LANGUAGE := zh-CN
 TW_USE_MODEL_HARDWARE_ID_FOR_DEVICE_ID := true
 TARGET_USE_CUSTOM_LUN_FILE_PATH := "/sys/class/android_usb/android0/f_mass_storage/lun/file"
 TWHAVE_SELINUX := true
+# TW_NEW_ION_HEAP := true