Skip to content
This repository has been archived by the owner on May 9, 2024. It is now read-only.

Commit

Permalink
Update
Browse files Browse the repository at this point in the history
  • Loading branch information
xunmod committed Feb 4, 2024
1 parent 2c66d97 commit c9a52a4
Show file tree
Hide file tree
Showing 4 changed files with 43 additions and 35 deletions.
23 changes: 23 additions & 0 deletions .github/twrp.patch
Original file line number Diff line number Diff line change
@@ -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 \
15 changes: 0 additions & 15 deletions .github/twrp_gdb.patch

This file was deleted.

33 changes: 16 additions & 17 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand All @@ -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
7 changes: 4 additions & 3 deletions recovery/twrp.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit c9a52a4

Please sign in to comment.