diff --git a/.github/workflows/by511.yml b/.github/workflows/by511.yml index 29667cb..10a562e 100644 --- a/.github/workflows/by511.yml +++ b/.github/workflows/by511.yml @@ -2,7 +2,6 @@ name: (5)Compile TWRP by omnirom 5.1.1 on: push: branches: [ 'twrp-5.1' ] - workflow_dispatch: jobs: build: runs-on: ubuntu-latest @@ -18,14 +17,14 @@ jobs: sudo chmod +x /usr/bin/repo # sudo apt remove -yq openjdk* sudo apt update - sudo apt install -yq bc bison build-essential curl flex g++-multilib gcc-multilib git gnupg gperf imagemagick lib32ncurses5-dev lib32readline-dev lib32z1-dev liblz4-tool libncurses5 libncurses5-dev libsdl1.2-dev libssl-dev libxml2 libxml2-utils lzop pngcrush rsync schedtool squashfs-tools xsltproc zip zlib1g-dev python bash ccache python3 + sudo apt install -yq bc bison build-essential curl flex g++-multilib gcc-multilib git gnupg gperf imagemagick lib32ncurses5-dev lib32readline-dev lib32z1-dev liblz4-tool libncurses5 libncurses5-dev libsdl1.2-dev libssl-dev libxml2 libxml2-utils lzop pngcrush rsync schedtool squashfs-tools xsltproc zip zlib1g-dev python bash ccache git config --global user.email "116288337+xunmod@users.noreply.github.com" git config --global user.name "xunmod@bot" sudo su -c 'echo "deb http://security.debian.org/debian-security buster/updates main" >> /etc/apt/sources.list' root sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 112695A0E562B32A 54404762BBB6E853 sudo apt update sudo apt install libc6 libc6-dev -y - - uses: actions/setup-java@v4 + - uses: actions/setup-java@v3 with: distribution: 'zulu' java-version: '8' @@ -36,18 +35,17 @@ jobs: repo init --depth=1 -u https://github.com/minimal-manifest-twrp/platform_manifest_twrp_omni.git -b twrp-5.1 repo sync -c -f --no-tags --no-clone-bundle -j$(nproc --all) - name: Setup device - uses: actions/checkout@v4 + uses: actions/checkout@v3 with: path: 'twrp/device/Xiaoxun' - name: Build shell: bash run: | - sudo rm -f /usr/bin/python /usr/local/bin/python + sudo rm -f /usr/bin/python /usr/bin/python3.6 /usr/bin/python3.6m /usr/local/bin/python sudo ln -sf /usr/bin/python2.7 /usr/bin/python cd $GITHUB_WORKSPACE/twrp source build/envsetup.sh lunch omni_sl8521e_1h10ll_sw761-eng - ls system/extras/libasyncio || exit 1 mka -j$(nproc --all) recoveryimage export twrp_version=$(cat bootable/recovery/variables.h | grep "define TW_MAIN_VERSION_STR" | cut -d '"' -f2) cp out/target/product/sl8521e_1h10ll_sw761/recovery.img ../twrp-${twrp_version}_0-sl8521e_1h10ll_sw761.img @@ -57,15 +55,15 @@ jobs: lunch omni_sl8521e_1h10ll_sw771-eng mka -j$(nproc --all) recoveryimage cp out/target/product/sl8521e_1h10ll_sw771/recovery.img ../twrp-${twrp_version}_0-sl8521e_1h10ll_sw771.img - - uses: actions/upload-artifact@v4 + - uses: actions/upload-artifact@v3 with: name: TWRP Image for MiKids4 path: 'twrp-*_sw761.img' - - uses: actions/upload-artifact@v4 + - uses: actions/upload-artifact@v3 with: name: TWRP Image for MiKids4x path: 'twrp-*_sw763.img' - - uses: actions/upload-artifact@v4 + - uses: actions/upload-artifact@v3 with: name: TWRP Image for MiKids6x path: 'twrp-*_sw771.img' diff --git a/sl8521e_1h10ll-common/force_mtp_ffs.patch b/sl8521e_1h10ll-common/force_mtp_ffs.patch deleted file mode 100644 index e6ca906..0000000 --- a/sl8521e_1h10ll-common/force_mtp_ffs.patch +++ /dev/null @@ -1,94 +0,0 @@ -diff --git a/Android.mk b/Android.mk -index aedb3f9..957884a 100755 ---- a/Android.mk -+++ b/Android.mk -@@ -233,14 +233,10 @@ ifeq ($(TW_FORCE_USE_BUSYBOX), true) - else - TW_USE_TOOLBOX := true - endif --ifeq ($(TW_EXCLUDE_MTP),) -- LOCAL_SHARED_LIBRARIES += libtwrpmtp-ffs - endif --else -+ - ifeq ($(TW_EXCLUDE_MTP),) -- LOCAL_CFLAGS += -DTW_HAS_LEGACY_MTP -- LOCAL_SHARED_LIBRARIES += libtwrpmtp-legacy --endif -+ LOCAL_SHARED_LIBRARIES += libtwrpmtp-ffs - endif - - ifeq ($(BOARD_USES_RECOVERY_AS_BOOT), true) -@@ -897,11 +893,7 @@ ifeq ($(shell test $(PLATFORM_SDK_VERSION) -le 25; echo $$?),0) - include $(commands_TWRP_local_path)/bootloader_message/Android.mk - endif - --ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 28; echo $$?),0) -- include $(commands_TWRP_local_path)/mtp/ffs/Android.mk --else -- include $(commands_TWRP_local_path)/mtp/legacy/Android.mk --endif -+include $(commands_TWRP_local_path)/mtp/ffs/Android.mk - - ifeq ($(wildcard system/core/uncrypt/Android.mk),) - #include $(commands_TWRP_local_path)/uncrypt/Android.mk -diff --git a/mtp/ffs/MtpFfsCompatHandle.cpp b/mtp/ffs/MtpFfsCompatHandle.cpp -index 4027d60..c738edb 100644 ---- a/mtp/ffs/MtpFfsCompatHandle.cpp -+++ b/mtp/ffs/MtpFfsCompatHandle.cpp -@@ -15,7 +15,7 @@ - */ - - #include --#include -+#include - #include - #include - #include -diff --git a/mtp/ffs/MtpFfsHandle.cpp b/mtp/ffs/MtpFfsHandle.cpp -index 01b6f2e..c471462 100644 ---- a/mtp/ffs/MtpFfsHandle.cpp -+++ b/mtp/ffs/MtpFfsHandle.cpp -@@ -15,7 +15,7 @@ - */ - - #include --#include -+#include - #include - #include - #include -diff --git a/mtp/ffs/MtpServer.cpp b/mtp/ffs/MtpServer.cpp -index fa67024..67197a1 100755 ---- a/mtp/ffs/MtpServer.cpp -+++ b/mtp/ffs/MtpServer.cpp -@@ -16,7 +16,7 @@ - - #include - #include --#include -+#include - #include - #include - #include -diff --git a/prebuilt/Android.mk b/prebuilt/Android.mk -index 17636ae..b1ae736 100644 ---- a/prebuilt/Android.mk -+++ b/prebuilt/Android.mk -@@ -158,16 +158,10 @@ else - TW_EXCLUDE_MTP := true - endif - --ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 28; echo $$?),0) - ifneq ($(TW_EXCLUDE_MTP), true) - RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libtwrpmtp-ffs.so - RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libasyncio.so - endif --else --ifneq ($(TW_EXCLUDE_MTP), true) -- RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libtwrpmtp-legacy.so --endif --endif - - RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libext4_utils.so - RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libaosprecovery.so diff --git a/sl8521e_1h10ll-common/vendorsetup.sh b/sl8521e_1h10ll-common/vendorsetup.sh deleted file mode 100644 index b6a125a..0000000 --- a/sl8521e_1h10ll-common/vendorsetup.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -grep libtwrpmtp-legacy bootable/recovery/Android.mk &>/dev/null && patch -d bootable/recovery -f -p1 < device/Xiaoxun/sl8521e_1h10ll-common/force_mtp_ffs.patch diff --git a/sl8521e_1h10ll_sw761/omni.dependencies b/sl8521e_1h10ll_sw761/omni.dependencies deleted file mode 100644 index 668d1ea..0000000 --- a/sl8521e_1h10ll_sw761/omni.dependencies +++ /dev/null @@ -1,14 +0,0 @@ -[ - { - "remote": "github", - "repository": "xunmod/android_system_core_libasyncio", - "target_path": "system/extras/libasyncio", - "revision": "main" - }, - { - "remote": "github", - "repository": "xunmod/android_system_core_base", - "target_path": "system/extras/libbase", - "revision": "android-5.1" - } -] diff --git a/sl8521e_1h10ll_sw763/omni.dependencies b/sl8521e_1h10ll_sw763/omni.dependencies deleted file mode 100644 index 668d1ea..0000000 --- a/sl8521e_1h10ll_sw763/omni.dependencies +++ /dev/null @@ -1,14 +0,0 @@ -[ - { - "remote": "github", - "repository": "xunmod/android_system_core_libasyncio", - "target_path": "system/extras/libasyncio", - "revision": "main" - }, - { - "remote": "github", - "repository": "xunmod/android_system_core_base", - "target_path": "system/extras/libbase", - "revision": "android-5.1" - } -] diff --git a/sl8521e_1h10ll_sw771/omni.dependencies b/sl8521e_1h10ll_sw771/omni.dependencies deleted file mode 100644 index 668d1ea..0000000 --- a/sl8521e_1h10ll_sw771/omni.dependencies +++ /dev/null @@ -1,14 +0,0 @@ -[ - { - "remote": "github", - "repository": "xunmod/android_system_core_libasyncio", - "target_path": "system/extras/libasyncio", - "revision": "main" - }, - { - "remote": "github", - "repository": "xunmod/android_system_core_base", - "target_path": "system/extras/libbase", - "revision": "android-5.1" - } -]