Mirrors/revanced-magisk-module
1
0
Fork 0
mirror of https://github.com/j-hc/revanced-magisk-module.git synced 2025-05-05 00:54:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

dont manually extract libs and build arm-v7a yt music

Browse Source
This commit is contained in:
j-hc 2022-07-22 14:44:04 +03:00
parent 0c79ea90af
commit 2b2699ad55
No known key found for this signature in database
GPG Key ID: 242B44D16774A2ED
4 changed files with 62 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
.github/workflows/build.yml vendored
View File

@ -31,7 +31,8 @@ jobs:
- id: get_output - id: get_output
run: | run: |
echo ::set-output name=YT_OUTPUT::$(find . -maxdepth 1 -name "yt-revanced-magisk-*.zip" -printf '%P') echo ::set-output name=YT_OUTPUT::$(find . -maxdepth 1 -name "yt-revanced-magisk-*.zip" -printf '%P')
echo ::set-output name=MUSIC_OUTPUT::$(find . -maxdepth 1 -name "music-revanced-magisk-*.zip" -printf '%P') echo ::set-output name=MUSIC_OUTPUT_ARM64::$(find . -maxdepth 1 -name "music-revanced-magisk-*-arm64-v8a.zip" -printf '%P')
echo ::set-output name=MUSIC_OUTPUT_ARM::$(find . -maxdepth 1 -name "music-revanced-magisk-*-arm-v7a.zip" -printf '%P')
BUILD_LOG=$(cat build.log) BUILD_LOG=$(cat build.log)
BUILD_LOG="${BUILD_LOG//'%'/'%25'}" BUILD_LOG="${BUILD_LOG//'%'/'%25'}"
@ -71,9 +72,13 @@ jobs:
echo "$UPDATE_YT_JSON" >yt-update.json echo "$UPDATE_YT_JSON" >yt-update.json
MUSIC_VER=$(echo "${{ steps.get_output.outputs.BUILD_LOG }}" | sed -n 's/.*Music version: \(.*\)/\1/p') MUSIC_VER=$(echo "${{ steps.get_output.outputs.BUILD_LOG }}" | sed -n 's/.*Music version: \(.*\)/\1/p')
MUSIC_DLURL="$GITHUB_SERVER_URL/$GITHUB_REPOSITORY/releases/download/${{ steps.next_ver_code.outputs.NEXT_VER_CODE}}/${{ steps.get_output.outputs.MUSIC_OUTPUT }}" MUSIC_ARM64_DLURL="$GITHUB_SERVER_URL/$GITHUB_REPOSITORY/releases/download/${{ steps.next_ver_code.outputs.NEXT_VER_CODE}}/${{ steps.get_output.outputs.MUSIC_OUTPUT_ARM64 }}"
UPDATE_MUSIC_JSON=$(get_update_json $MUSIC_VER ${{ steps.next_ver_code.outputs.NEXT_VER_CODE}} $MUSIC_DLURL $CHANGELOG_URL) MUSIC_ARM_DLURL="$GITHUB_SERVER_URL/$GITHUB_REPOSITORY/releases/download/${{ steps.next_ver_code.outputs.NEXT_VER_CODE}}/${{ steps.get_output.outputs.MUSIC_OUTPUT_ARM }}"
echo "$UPDATE_MUSIC_JSON" >music-update.json
UPDATE_MUSIC_ARM64_JSON=$(get_update_json $MUSIC_VER ${{ steps.next_ver_code.outputs.NEXT_VER_CODE}} $MUSIC_ARM64_DLURL $CHANGELOG_URL)
echo "$UPDATE_MUSIC_ARM64_JSON" >music-update-arm64-v8a.json
UPDATE_MUSIC_ARM_JSON=$(get_update_json $MUSIC_VER ${{ steps.next_ver_code.outputs.NEXT_VER_CODE}} $MUSIC_ARM_DLURL $CHANGELOG_URL)
echo "$UPDATE_MUSIC_ARM_JSON" >music-update-arm-v7a.json
- uses: stefanzweifel/git-auto-commit-action@v4 - uses: stefanzweifel/git-auto-commit-action@v4
with: with:

1
.gitignore vendored
View File

@ -2,7 +2,6 @@
*.apk *.apk
*.zip *.zip
*.keystore *.keystore
*.so
/revanced-cache /revanced-cache
/temp /temp
build.log build.log

19
build.sh
View File

@ -17,36 +17,37 @@ print_usage() {
if [ -z ${1+x} ]; then if [ -z ${1+x} ]; then
print_usage print_usage
exit 0 exit 0
elif [ "$1" == "clean" ]; then elif [ "$1" = "clean" ]; then
rm -rf ./temp ./revanced-cache ./*.jar ./*.apk ./*.zip ./*.keystore build.log rm -rf ./temp ./revanced-cache ./*.jar ./*.apk ./*.zip ./*.keystore build.log
reset_template reset_template
exit 0 exit 0
elif [ "$1" == "reset-template" ]; then elif [ "$1" = "reset-template" ]; then
reset_template reset_template
exit 0 exit 0
elif [ "$1" == "all" ]; then elif [ "$1" = "all" ]; then
BUILD_YT=true BUILD_YT=true
BUILD_MUSIC=true BUILD_MUSIC=true
elif [ "$1" == "youtube" ]; then elif [ "$1" = "youtube" ]; then
BUILD_YT=true BUILD_YT=true
elif [ "$1" == "music" ]; then elif [ "$1" = "music" ]; then
BUILD_MUSIC=true BUILD_MUSIC=true
else else
print_usage print_usage
exit 1 exit 1
fi fi
>build.log true >build.log
log "$(date +'%Y-%m-%d')\n" log "$(date +'%Y-%m-%d')\n"
get_prebuilts get_prebuilts
if $BUILD_YT; then if [ "$BUILD_YT" = true ]; then
build_yt "$YT_PATCHER_ARGS" build_yt "$YT_PATCHER_ARGS"
fi fi
if $BUILD_MUSIC; then if [ "$BUILD_MUSIC" = true ]; then
build_music "$MUSIC_PATCHER_ARGS" build_music "$MUSIC_PATCHER_ARGS" "$ARM64_V8A"
build_music "$MUSIC_PATCHER_ARGS" "$ARM_V7A"
fi fi
echo "Done" echo "Done"

67
utils.sh
View File

@ -1,8 +1,13 @@
#!/bin/bash #!/bin/bash
# this is the repo to fallback for magisk update json if you are not building on github actions ↓
GITHUB_REPO_FALLBACK="j-hc/revanced-magisk-module"
# dont change anything after this point ↓
MODULE_TEMPLATE_DIR="revanced-magisk" MODULE_TEMPLATE_DIR="revanced-magisk"
TEMP_DIR="temp" TEMP_DIR="temp"
GITHUB_REPO_FALLBACK="j-hc/revanced-magisk-module" ARM64_V8A="arm64-v8a"
ARM_V7A="arm-v7a"
: "${GITHUB_REPOSITORY:=$GITHUB_REPO_FALLBACK}" : "${GITHUB_REPOSITORY:=$GITHUB_REPO_FALLBACK}"
: "${NEXT_VER_CODE:=$(date +'%Y%m%d')}" : "${NEXT_VER_CODE:=$(date +'%Y%m%d')}"
@ -33,7 +38,7 @@ reset_template() {
echo "# utils" >"${MODULE_TEMPLATE_DIR}/common/install.sh" echo "# utils" >"${MODULE_TEMPLATE_DIR}/common/install.sh"
echo "# utils" >"${MODULE_TEMPLATE_DIR}/service.sh" echo "# utils" >"${MODULE_TEMPLATE_DIR}/service.sh"
echo "# utils" >"${MODULE_TEMPLATE_DIR}/module.prop" echo "# utils" >"${MODULE_TEMPLATE_DIR}/module.prop"
rm -f "${MODULE_TEMPLATE_DIR}/base.apk" "${MODULE_TEMPLATE_DIR}/libjsc.so" rm -f "${MODULE_TEMPLATE_DIR}/base.apk"
} }
req() { req() {
@ -65,8 +70,16 @@ dl_yt() {
dl_music() { dl_music() {
echo "Downloading YouTube Music" echo "Downloading YouTube Music"
local url="https://www.apkmirror.com/apk/google-inc/youtube-music/youtube-music-${1//./-}-release/" local url="https://www.apkmirror.com/apk/google-inc/youtube-music/youtube-music-${1//./-}-release/"
url="https://www.apkmirror.com$(req "$url" - | tr '\n' ' ' | sed -n 's/href="/@/g; s;.*arm64-v8a</div>[^@]*@\([^"]*\).*;\1;p')" local arch="$3"
log "\nYouTube Music version: $1\ndownloaded from: [APKMirror]($url)" if [ "$arch" = "$ARM64_V8A" ]; then
url="https://www.apkmirror.com$(req "$url" - | tr '\n' ' ' | sed -n 's/href="/@/g; s;.*arm64-v8a</div>[^@]*@\([^"]*\).*;\1;p')"
elif [ "$arch" = "$ARM_V7A" ]; then
url="https://www.apkmirror.com$(req "$url" - | tr '\n' ' ' | sed -n 's/href="/@/g; s;.*armeabi-v7a</div>[^@]*@\([^"]*\).*;\1;p')"
else
echo "Wrong arch: '$arch'"
return
fi
log "\nYouTube Music ($arch) version: $1\ndownloaded from: [APKMirror]($url)"
url="https://www.apkmirror.com$(req "$url" - | tr '\n' ' ' | sed -n 's;.*href="\(.*key=[^"]*\)">.*;\1;p')" url="https://www.apkmirror.com$(req "$url" - | tr '\n' ' ' | sed -n 's;.*href="\(.*key=[^"]*\)">.*;\1;p')"
url="https://www.apkmirror.com$(req "$url" - | tr '\n' ' ' | sed -n 's;.*href="\(.*key=[^"]*\)">.*;\1;p')" url="https://www.apkmirror.com$(req "$url" - | tr '\n' ' ' | sed -n 's;.*href="\(.*key=[^"]*\)">.*;\1;p')"
req "$url" "$2" req "$url" "$2"
@ -75,24 +88,24 @@ dl_music() {
build_yt() { build_yt() {
echo "Patching YouTube" echo "Patching YouTube"
reset_template reset_template
local supported_versions last_ver yt_base_apk dl_output yt_patched_apk output local supported_versions last_ver
# This only finds the supported versions of some random patch wrt the first occurance of the string but that's fine # This only finds the supported versions of some random patch wrt the first occurance of the string but that's fine
supported_versions=$(unzip -p "$RV_PATCHES_JAR" | strings -n 8 -s , | sed -rn 's/.*youtube,versions,(([0-9.]*,*)*),Lk.*/\1/p') supported_versions=$(unzip -p "$RV_PATCHES_JAR" | strings -n 8 -s , | sed -rn 's/.*youtube,versions,(([0-9.]*,*)*),Lk.*/\1/p')
echo "Supported versions of the YouTube patch: $supported_versions" echo "Supported versions of the YouTube patch: $supported_versions"
last_ver=$(echo "$supported_versions" | awk -F, '{ print $NF }') last_ver=$(echo "$supported_versions" | awk -F, '{ print $NF }')
echo "Choosing '${last_ver}'" echo "Choosing '${last_ver}'"
yt_base_apk="${TEMP_DIR}/base-v${last_ver}.apk" local yt_base_apk="${TEMP_DIR}/base-v${last_ver}.apk"
if [ ! -f "$yt_base_apk" ]; then if [ ! -f "$yt_base_apk" ]; then
dl_yt "$last_ver" "$yt_base_apk" dl_yt "$last_ver" "$yt_base_apk"
fi fi
yt_patched_apk="${TEMP_DIR}/yt-revanced-base.apk" local yt_patched_apk="${TEMP_DIR}/yt-revanced-base.apk"
java -jar $RV_CLI_JAR -a $yt_base_apk -c -o $yt_patched_apk -b $RV_PATCHES_JAR -m $RV_INTEGRATIONS_APK $1 java -jar $RV_CLI_JAR -a $yt_base_apk -c -o $yt_patched_apk -b $RV_PATCHES_JAR -m $RV_INTEGRATIONS_APK $1
mv -f "$yt_patched_apk" "${MODULE_TEMPLATE_DIR}/base.apk" mv -f "$yt_patched_apk" "${MODULE_TEMPLATE_DIR}/base.apk"
echo "Creating the magisk module for YouTube..." echo "Creating the magisk module for YouTube..."
output="yt-revanced-magisk-v${last_ver}-all.zip" local output="yt-revanced-magisk-v${last_ver}-all.zip"
service_sh "com.google.android.youtube" service_sh "com.google.android.youtube"
yt_module_prop "$last_ver" yt_module_prop "$last_ver"
@ -105,35 +118,30 @@ build_yt() {
} }
build_music() { build_music() {
echo "Patching YouTube Music" local arch="$2"
echo "Patching YouTube Music ($arch)"
reset_template reset_template
local supported_versions last_ver music_apk music_patched_apk output local supported_versions last_ver
# This only finds the supported versions of some random patch wrt the first occurance of the string but that's fine # This only finds the supported versions of some random patch wrt the first occurance of the string but that's fine
supported_versions=$(unzip -p "$RV_PATCHES_JAR" | strings -n 7 -s , | sed -rn 's/.*music,versions,(([0-9.]*,*)*),Lk.*/\1/p') supported_versions=$(unzip -p "$RV_PATCHES_JAR" | strings -n 7 -s , | sed -rn 's/.*music,versions,(([0-9.]*,*)*),Lk.*/\1/p')
echo "Supported versions of the Music patch: $supported_versions" echo "Supported versions of the Music patch: $supported_versions"
last_ver=$(echo "$supported_versions" | awk -F, '{ print $NF }') last_ver=$(echo "$supported_versions" | awk -F, '{ print $NF }')
echo "Choosing '${last_ver}'" echo "Choosing '${last_ver}'"
music_apk="${TEMP_DIR}/music-stock-v${last_ver}.apk" local music_apk="${TEMP_DIR}/music-stock-v${last_ver}-${arch}.apk"
if [ ! -f "$music_apk" ]; then if [ ! -f "$music_apk" ]; then
dl_music "$last_ver" "$music_apk" dl_music "$last_ver" "$music_apk" "$arch"
fi fi
unzip -p "$music_apk" "lib/arm64-v8a/libjsc.so" >"${MODULE_TEMPLATE_DIR}/libjsc.so" local music_patched_apk="${TEMP_DIR}/music-revanced-base.apk"
music_patched_apk="${TEMP_DIR}/music-revanced-base.apk"
java -jar $RV_CLI_JAR -a $music_apk -c -o $music_patched_apk -b $RV_PATCHES_JAR -m $RV_INTEGRATIONS_APK $1 java -jar $RV_CLI_JAR -a $music_apk -c -o $music_patched_apk -b $RV_PATCHES_JAR -m $RV_INTEGRATIONS_APK $1
mv -f "$music_patched_apk" "${MODULE_TEMPLATE_DIR}/base.apk" mv -f "$music_patched_apk" "${MODULE_TEMPLATE_DIR}/base.apk"
echo "Creating the magisk module for YouTube Music" echo "Creating the magisk module for YouTube Music ($arch)"
output="music-revanced-magisk-v${last_ver}-arm64-v8a.zip" local output="music-revanced-magisk-v${last_ver}-${arch}.zip"
service_sh "com.google.android.apps.youtube.music" service_sh "com.google.android.apps.youtube.music"
music_module_prop "$last_ver" music_module_prop "$last_ver" "$arch"
echo 'YTPATH=$(pm path com.google.android.apps.youtube.music | grep base | sed "s/package://g; s/\/base.apk//g")
if [ -n "$YTPATH" ]; then
cp_ch -n $MODPATH/libjsc.so $YTPATH/lib/arm64 0755
fi' >"${MODULE_TEMPLATE_DIR}/common/install.sh"
cd "$MODULE_TEMPLATE_DIR" || return cd "$MODULE_TEMPLATE_DIR" || return
zip -r "../$output" . zip -r "../$output" .
@ -164,11 +172,22 @@ updateJson=https://raw.githubusercontent.com/${GITHUB_REPOSITORY}/update/yt-upda
} }
music_module_prop() { music_module_prop() {
echo "id=ytmusicrv-magisk local arch="$2"
local update_json="https://raw.githubusercontent.com/${GITHUB_REPOSITORY}/update/music-update-${arch}.json"
if [ "$arch" = "$ARM64_V8A" ]; then
local id="ytmusicrv-magisk"
elif [ "$arch" = "$ARM_V7A" ]; then
local id="ytmusicrv-arm-magisk"
else
echo "Wrong arch for prop: '$arch'"
return
fi
echo "id=${id}
name=YouTube Music ReVanced name=YouTube Music ReVanced
version=v${1} version=v${1}
versionCode=${NEXT_VER_CODE} versionCode=${NEXT_VER_CODE}
author=j-hc author=j-hc
description=mounts base.apk for YouTube Music ReVanced description=mounts base.apk for YouTube Music ReVanced
updateJson=https://raw.githubusercontent.com/${GITHUB_REPOSITORY}/update/music-update.json" >"${MODULE_TEMPLATE_DIR}/module.prop" updateJson=${update_json}" >"${MODULE_TEMPLATE_DIR}/module.prop"
} }