change split arch, added rufusin, more anddea app

- Previous I use my forked cli in 582c94e90a
To make split file smaller. But now Revanced cli already fix problem in
https://github.com/ReVanced/revanced-library/issues/16
So I revert to old split arch for faster split
- Added more apps, rename little things...
This commit is contained in:
siritami
2024-04-15 13:08:23 +07:00
parent 9a27a4ef66
commit 7161b7691d
20 changed files with 261 additions and 164 deletions

View File

@@ -0,0 +1,43 @@
#!/bin/bash
# Revanced Extended forked by Anddea build
source src/build/utils.sh
patch_rve_anddea () {
# Patch YouTube Revanced Extended Anddea:
dl_gh "revanced-cli" "revanced" "latest"
local v apk_name
if [[ "$1" == "latest" ]]; then
v="latest" apk_name="stable"
else
v="prerelease" apk_name="beta"
fi
dl_gh " revanced-patches revanced-integrations" "anddea" "$v"
get_patches_key "youtube-rve-anddea"
get_ver "Hide general ads" "com.google.android.youtube"
get_apk "youtube-$apk_name" "youtube" "google-inc/youtube/youtube"
patch "youtube-$apk_name" "anddea"
# Patch Youtube Music:
# Arm64-v8a
get_patches_key "youtube-music-rve-anddea"
get_ver "Hide general ads" "com.google.android.apps.youtube.music"
get_apk "youtube-music-$apk_name-arm64-v8a" "youtube-music" "google-inc/youtube-music/youtube-music" "arm64-v8a"
patch "youtube-music-$apk_name-arm64-v8a" "anddea"
# Armeabi-v7a
get_patches_key "youtube-music-rve-anddea"
get_ver "Hide general ads" "com.google.android.apps.youtube.music"
get_apk "youtube-music-$apk_name-armeabi-v7a" "youtube-music" "google-inc/youtube-music/youtube-music" "armeabi-v7a"
patch "youtube-music-$apk_name-armeabi-v7a" "anddea"
# Patch Reddit:
get_patches_key "reddit"
get_apk "reddit-$apk_name" "reddit" "redditinc/reddit/reddit"
patch "reddit-$apk_name" "anddea"
# Split architecture:
rm -f revanced-cli* revanced-patches*.jar patches.json
dl_gh "revanced-cli" "inotia00" "latest"
dl_gh "revanced-patches" "inotia00" "latest"
# Split architecture Youtube:
for i in {0..3}; do
split_arch "youtube-$apk_name-anddea" "youtube-$apk_name-${archs[i]}-anddea" "$(gen_rip_libs ${libs[i]})"
done
}
patch_rve_anddea $1

View File

@@ -1,27 +0,0 @@
#!/bin/bash
# ReX forked by anddea build
source src/build/utils.sh
patch_ReX_anddea () {
# Patch YouTube ReX anddea:
dl_gh "revanced-cli" "inotia00" "latest"
get_patches_key "youtube-ReX-anddea"
local v apk_name
if [[ "$1" == "latest" ]]; then
v="latest" apk_name="stable"
else
v="prerelease" apk_name="beta"
fi
dl_gh " revanced-patches revanced-integrations" "anddea" "$v"
get_ver "Hide general ads" "com.google.android.youtube"
get_apk "youtube-$apk_name" "youtube" "google-inc/youtube/youtube"
patch "youtube-$apk_name" "ReX-anddea" "inotia"
# Split architecture Youtube:
rm -f revanced-cli*
dl_gh "revanced-cli" "FiorenMas" "latest"
get_patches_key "youtube-ReX-anddea"
for i in {0..3}; do
split_arch "youtube-$apk_name" "youtube-$apk_name-${archs[i]}-ReX-anddea" "$(gen_rip_libs ${libs[i]})"
done
}
patch_ReX_anddea $1

View File

@@ -6,7 +6,7 @@ source src/build/utils.sh
# Download requirements
dl_gh "ReX-patches ReX-integrations" "YT-Advanced" "latest"
dl_gh "revanced-cli" "inotia00" "latest"
dl_gh "revanced-cli" "revanced" "latest"
#################################################
@@ -14,7 +14,7 @@ dl_gh "revanced-cli" "inotia00" "latest"
get_patches_key "youtube-ReX"
get_ver "Hide general ads" "com.google.android.youtube"
get_apk "youtube" "youtube" "google-inc/youtube/youtube"
patch "youtube" "ReX" "inotia"
patch "youtube" "ReX"
#################################################
@@ -23,28 +23,30 @@ patch "youtube" "ReX" "inotia"
get_patches_key "youtube-music-ReX"
get_ver "Enable color match player" "com.google.android.apps.youtube.music"
get_apk "youtube-music-arm64-v8a" "youtube-music" "google-inc/youtube-music/youtube-music" "arm64-v8a"
patch "youtube-music-arm64-v8a" "ReX" "inotia"
patch "youtube-music-arm64-v8a" "ReX"
# Armeabi-v7a
get_patches_key "youtube-music-ReX"
get_ver "Enable color match player" "com.google.android.apps.youtube.music"
get_apk "youtube-music-armeabi-v7a" "youtube-music" "google-inc/youtube-music/youtube-music" "armeabi-v7a"
patch "youtube-music-armeabi-v7a" "ReX" "inotia"
patch "youtube-music-armeabi-v7a" "ReX"
#################################################
# Patch Reddit:
get_patches_key "reddit"
get_apk "reddit" "reddit" "redditinc/reddit/reddit"
patch "reddit" "ReX" "inotia"
patch "reddit" "ReX"
#################################################
rm -f revanced-cli*
dl_gh "revanced-cli" "FiorenMas" "latest"
# Split architecture:
rm -f revanced-cli* revanced-patches*.jar patches.json
dl_gh "revanced-cli" "inotia00" "latest"
dl_gh "revanced-patches" "inotia00" "latest"
# Split architecture Youtube:
get_patches_key "youtube-ReX"
for i in {0..3}; do
split_arch "youtube" "youtube-${archs[i]}-ReX" "$(gen_rip_libs ${libs[i]})"
split_arch "youtube-ReX" "youtube-${archs[i]}-ReX" "$(gen_rip_libs ${libs[i]})"
done
#################################################

View File

@@ -33,12 +33,11 @@ patch "youtube-music-armeabi-v7a" "revanced"
# Split architecture:
rm -f revanced-cli* revanced-patches*.jar patches.json
dl_gh "revanced-cli" "FiorenMas" "latest"
dl_gh "revanced-cli" "inotia00" "latest"
dl_gh "revanced-patches" "revanced" "latest"
# Split architecture Youtube:
get_patches_key "youtube-revanced"
for i in {0..3}; do
split_arch "youtube" "youtube-${archs[i]}-revanced" "$(gen_rip_libs ${libs[i]})"
split_arch "youtube-revanced" "youtube-${archs[i]}-revanced" "$(gen_rip_libs ${libs[i]})"
done
#################################################

View File

@@ -33,13 +33,12 @@ patch "youtube-music-beta-armeabi-v7a" "revanced"
#################################################
# Split architecture:
rm -f revanced-cli* revanced-patches*.jar patches.json
rm -f revanced-cli* revanced-patches*.jar patches.json
dl_gh "revanced-cli" "inotia00" "latest"
dl_gh "revanced-patches" "revanced" "prerelease"
dl_gh "revanced-cli" "FiorenMas" "latest"
# Split architecture Youtube:
get_patches_key "youtube-revanced"
for i in {0..3}; do
split_arch "youtube-beta" "youtube-beta-${archs[i]}-revanced" "$(gen_rip_libs ${libs[i]})"
split_arch "youtube-beta-revanced" "youtube-beta-${archs[i]}-revanced" "$(gen_rip_libs ${libs[i]})"
done
#################################################

View File

@@ -24,7 +24,7 @@ dl_gh "revanced-cli" "inotia00" "latest"
dl_gh "revanced-patches" "inotia00" "latest"
# Split architecture Youtube:
for i in {0..3}; do
_split_arch "youtube-revanced-extended-android-5" "youtube-${archs[i]}-revanced-extended-android-5" "$(_gen_rip_libs ${_libs[i]})"
split_arch "youtube-revanced-extended-android-5" "youtube-${archs[i]}-revanced-extended-android-5" "$(_gen_rip_libs ${_libs[i]})"
done
#################################################

View File

@@ -24,7 +24,7 @@ dl_gh "revanced-cli" "inotia00" "latest"
dl_gh "revanced-patches" "inotia00" "latest"
# Split architecture Youtube:
for i in {0..3}; do
_split_arch "youtube-revanced-extended-android-6-7" "youtube-${archs[i]}-revanced-extended-android-6-7" "$(_gen_rip_libs ${_libs[i]})"
split_arch "youtube-revanced-extended-android-6-7" "youtube-${archs[i]}-revanced-extended-android-6-7" "$(_gen_rip_libs ${_libs[i]})"
done
#################################################

View File

@@ -38,12 +38,9 @@ patch "reddit" "revanced-extended" "inotia"
#################################################
rm -f revanced-cli*
dl_gh "revanced-cli" "FiorenMas" "latest"
# Split architecture Youtube:
get_patches_key "youtube-revanced-extended"
for i in {0..3}; do
split_arch "youtube" "youtube-${archs[i]}-revanced-extended" "$(gen_rip_libs ${libs[i]})"
split_arch "youtube-revanced-extended" "youtube-${archs[i]}-revanced-extended" "$(gen_rip_libs ${libs[i]})"
done
#################################################

View File

@@ -0,0 +1,29 @@
#!/bin/bash
# Revanced Extended forked by Rufusin build
source src/build/utils.sh
#################################################
# Download requirements
dl_gh "revanced-patches revanced-integrations" "rufusin" "latest"
dl_gh "revanced-cli" "revanced" "latest"
#################################################
# Patch YouTube Rufusin:
get_patches_key "youtube-rve-rufusin"
get_ver "Hide general ads" "com.google.android.youtube"
get_apk "youtube" "youtube" "google-inc/youtube/youtube"
patch "youtube" "rufusin"
#################################################
rm -f revanced-cli* revanced-patches*.jar patches.json
dl_gh "revanced-cli" "inotia00" "latest"
dl_gh "revanced-patches" "inotia00" "latest"
# Split architecture Youtube:
for i in {0..3}; do
split_arch "youtube-rufusin" "youtube-${archs[i]}-rufusin" "$(gen_rip_libs ${libs[i]})"
done
#################################################

View File

@@ -104,7 +104,7 @@ get_ver() {
| .compatiblePackages[]
| select(.name == $pkg_name)
| .versions[-1]
' patches.json)
' *.json)
[ "$version" == "null" ] && version=""
}
@@ -223,41 +223,15 @@ patch() {
#################################################
# Split architectures using Revanced CLI, created by j-hc or inotia00
# Split architectures using Revanced CLI, created by inotia00
archs=("arm64-v8a" "armeabi-v7a" "x86_64" "x86")
libs=("lib/armeabi-v7a lib/x86_64 lib/x86" "lib/arm64-v8a lib/x86_64 lib/x86" "lib/armeabi-v7a lib/arm64-v8a lib/x86" "lib/armeabi-v7a lib/arm64-v8a lib/x86_64")
libs=("armeabi-v7a x86_64 x86" "arm64-v8a x86_64 x86" "armeabi-v7a arm64-v8a x86" "armeabi-v7a arm64-v8a x86_64")
gen_rip_libs() {
for lib in $@; do
echo -n "--rip-lib "$lib" "
done
}
split_arch() {
green_log "[+] Splitting $1 to ${archs[i]}:"
if [ -f "./download/$1.apk" ]; then
eval java -jar revanced-cli*.jar patch \
--patch-bundle revanced-patches*.jar \
--merge revanced-integrations*.apk\
$excludePatches\
$includePatches \
--rip-lib res \
--rip-lib classes \
$3\
--options=./src/options/$2.json \
--keystore=./src/_ks.keystore \
--out=./release/$2.apk\
./download/$1.apk
else
red_log "[-] Not found $1.apk"
exit 1
fi
}
_libs=("armeabi-v7a x86_64 x86" "arm64-v8a x86_64 x86" "armeabi-v7a arm64-v8a x86" "armeabi-v7a arm64-v8a x86_64")
_gen_rip_libs() {
for lib in $@; do
echo -n "--rip-lib "$lib" "
done
}
_split_arch() {
green_log "[+] Splitting $1 to ${archs[i]}:"
if [ -f "./release/$1.apk" ]; then
eval java -jar revanced-cli*.jar patch \