Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
 Mitchel Stewart
|
26777abcaf |
+1
-4
@@ -105,7 +105,4 @@ venv.bak/
|
||||
# mypy
|
||||
.mypy_cache/
|
||||
|
||||
# nix
|
||||
result*
|
||||
|
||||
test.py
|
||||
test.py
|
||||
@@ -4,6 +4,20 @@ Script to add GApps and other stuff to Waydroid!
|
||||
|
||||
# Installation/Usage
|
||||
|
||||
## Dependencies
|
||||
|
||||
"lzip" is required for this script to work, install it using your distribution's package manager:
|
||||
### Arch, Manjaro and EndeavourOS based distributions:
|
||||
sudo pacman -S lzip
|
||||
### Debian and Ubuntu based distributions:
|
||||
sudo apt install lzip
|
||||
### RHEL, Fedora and Rocky based distributions:
|
||||
sudo dnf install lzip
|
||||
### openSUSE based distributions:
|
||||
sudo zypper install lzip
|
||||
|
||||
|
||||
|
||||
## Interactive terminal interface
|
||||
|
||||
```
|
||||
@@ -39,18 +53,6 @@ sudo venv/bin/python3 main.py certified
|
||||
sudo venv/bin/python3 main.py hack {nodataperm, hidestatusbar}
|
||||
```
|
||||
|
||||
## Dependencies
|
||||
|
||||
"lzip" is required for this script to work, install it using your distribution's package manager:
|
||||
### Arch, Manjaro and EndeavourOS based distributions:
|
||||
sudo pacman -S lzip
|
||||
### Debian and Ubuntu based distributions:
|
||||
sudo apt install lzip
|
||||
### RHEL, Fedora and Rocky based distributions:
|
||||
sudo dnf install lzip
|
||||
### openSUSE based distributions:
|
||||
sudo zypper install lzip
|
||||
|
||||
## Install OpenGapps
|
||||
|
||||
|
||||
@@ -166,7 +168,7 @@ chmod 777 -R /mnt/*/*/*/*/Android/obb
|
||||
|
||||
|
||||
```
|
||||
sudo venv/bin/python3 main.py install microg
|
||||
sudo python main.py install microg
|
||||
```
|
||||
|
||||
## Hide Status Bar
|
||||
|
||||
@@ -1,4 +0,0 @@
|
||||
let
|
||||
pkgs = import <nixpkgs> {};
|
||||
in
|
||||
pkgs.callPackage ./package.nix { }
|
||||
Generated
-41
@@ -1,41 +0,0 @@
|
||||
{
|
||||
"nodes": {
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1707650010,
|
||||
"narHash": "sha256-dOhphIA4MGrH4ElNCy/OlwmN24MsnEqFjRR6+RY7jZw=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "809cca784b9f72a5ad4b991e0e7bcf8890f9c3a6",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"id": "nixpkgs",
|
||||
"type": "indirect"
|
||||
}
|
||||
},
|
||||
"root": {
|
||||
"inputs": {
|
||||
"nixpkgs": "nixpkgs",
|
||||
"systems": "systems"
|
||||
}
|
||||
},
|
||||
"systems": {
|
||||
"locked": {
|
||||
"lastModified": 1681028828,
|
||||
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"type": "github"
|
||||
}
|
||||
}
|
||||
},
|
||||
"root": "root",
|
||||
"version": 7
|
||||
}
|
||||
@@ -1,21 +0,0 @@
|
||||
{
|
||||
description = "Waydroid Extras Script";
|
||||
inputs = {
|
||||
systems.url = "github:nix-systems/default";
|
||||
};
|
||||
outputs = { self, nixpkgs, systems }:
|
||||
let
|
||||
inherit (nixpkgs) lib;
|
||||
eachSystem = lib.genAttrs (import systems);
|
||||
mkApp = program: { type = "app"; inherit program; };
|
||||
in {
|
||||
packages = eachSystem (system: rec {
|
||||
waydroid_script = nixpkgs.legacyPackages."${system}".callPackage ./package.nix { };
|
||||
default = waydroid_script;
|
||||
});
|
||||
apps = eachSystem (system: rec {
|
||||
waydroid_script = mkApp "${self.outputs.packages.${system}.waydroid_script}/bin/waydroid_script";
|
||||
default = waydroid_script;
|
||||
});
|
||||
};
|
||||
}
|
||||
@@ -17,7 +17,6 @@ from stuff.ndk import Ndk
|
||||
from stuff.nodataperm import Nodataperm
|
||||
from stuff.smartdock import Smartdock
|
||||
from stuff.widevine import Widevine
|
||||
from stuff.fdroidpriv import FDroidPriv
|
||||
import tools.helper as helper
|
||||
from tools import container
|
||||
from tools import images
|
||||
@@ -87,8 +86,6 @@ def install_app(args):
|
||||
install_list.append(MicroG(args.android_version, args.microg_variant))
|
||||
if "mitm" in app:
|
||||
install_list.append(Mitm(args.ca_cert_file))
|
||||
if "fdroidpriv" in app:
|
||||
install_list.append(FDroidPriv(args.android_version))
|
||||
|
||||
if not container.use_overlayfs():
|
||||
copy_dir = "/tmp/waydroid"
|
||||
@@ -138,8 +135,6 @@ def remove_app(args):
|
||||
remove_list.append(MicroG(args.android_version, args.microg_variant))
|
||||
if "mitm" in app:
|
||||
remove_list.append(Mitm())
|
||||
if "fdroidpriv" in app:
|
||||
remove_list.append(FDroidPriv(args.android_version))
|
||||
if "nodataperm" in app:
|
||||
remove_list.append(Nodataperm(args.android_version))
|
||||
if "hidestatusbar" in app:
|
||||
@@ -210,7 +205,7 @@ def interact():
|
||||
Choice(name="Android 13", value="13"),
|
||||
Choice(name="Exit", value=None)
|
||||
],
|
||||
default="13",
|
||||
default="11",
|
||||
).execute()
|
||||
if not android_version:
|
||||
exit()
|
||||
@@ -229,9 +224,10 @@ def interact():
|
||||
if not action:
|
||||
exit()
|
||||
|
||||
install_choices = ["gapps", "microg", "libndk", "libhoudini", "magisk", "smartdock", "fdroidpriv", "widevine",]
|
||||
install_choices = ["gapps", "microg", "libndk", "magisk", "smartdock",]
|
||||
hack_choices = []
|
||||
if android_version=="11":
|
||||
install_choices.extend(["libhoudini", "widevine"])
|
||||
hack_choices.extend(["nodataperm", "hidestatusbar"])
|
||||
|
||||
if action == "Install":
|
||||
@@ -287,7 +283,7 @@ def main():
|
||||
parser.add_argument('-a', '--android-version',
|
||||
dest='android_version',
|
||||
help='Specify the Android version',
|
||||
default="13",
|
||||
default="11",
|
||||
choices=["11", "13"])
|
||||
|
||||
# android command
|
||||
|
||||
-32
@@ -1,32 +0,0 @@
|
||||
{ lib,
|
||||
stdenvNoCC,
|
||||
lzip,
|
||||
python3,
|
||||
makeWrapper }:
|
||||
let
|
||||
wrappedPath = lib.makeBinPath [ lzip ];
|
||||
in stdenvNoCC.mkDerivation {
|
||||
name = "waydroid_script";
|
||||
|
||||
buildInputs = [
|
||||
(python3.withPackages(ps: with ps; [ tqdm requests inquirerpy ]))
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
src = ./.;
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs main.py
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/libexec
|
||||
cp -r . $out/libexec/waydroid_script
|
||||
mkdir -p $out/bin
|
||||
makeShellWrapper $out/libexec/waydroid_script/main.py $out/bin/waydroid_script \
|
||||
--prefix PATH : "${wrappedPath}"
|
||||
'';
|
||||
}
|
||||
@@ -1,42 +0,0 @@
|
||||
import os
|
||||
import shutil
|
||||
from stuff.general import General
|
||||
|
||||
|
||||
class FDroidPriv(General):
|
||||
id = "fdroid priv"
|
||||
dl_links = {"11": ["https://f-droid.org/repo/org.fdroid.fdroid.privileged.ota_2130.zip",
|
||||
"6242cab56d197d80c598593a46da62e4"],
|
||||
"13": ["https://f-droid.org/repo/org.fdroid.fdroid.privileged.ota_2130.zip",
|
||||
"6242cab56d197d80c598593a46da62e4"]}
|
||||
partition = "system"
|
||||
dl_file_name = "org.fdroid.fdroid.privileged.ota_2130.zip"
|
||||
dl_link = ...
|
||||
act_md5 = ...
|
||||
extract_to = "/tmp/fdroid_ota_2130"
|
||||
files = [
|
||||
"app/F-Droid.apk"
|
||||
"app/F-Droid/F-Droid.apk"
|
||||
"etc/permissions/permissions_org.fdroid.fdroid.privileged.xml"
|
||||
"priv-app/F-DroidPrivilegedExtension.apk"
|
||||
"priv-app/F-DroidPrivilegedExtension/F-DroidPrivilegedExtension.apk"
|
||||
]
|
||||
file_map = {
|
||||
"permissions_org.fdroid.fdroid.privileged.xml": "etc/permissions/permissions_org.fdroid.fdroid.privileged.xml",
|
||||
"F-Droid.apk": "app/F-Droid/F-Droid.apk",
|
||||
"F-DroidPrivilegedExtension.apk": "priv-app/F-DroidPrivilegedExtension/F-DroidPrivilegedExtension.apk",
|
||||
}
|
||||
def __init__(self, android_version="11") -> None:
|
||||
super().__init__()
|
||||
self.dl_link = self.dl_links[android_version][0]
|
||||
self.act_md5 = self.dl_links[android_version][1]
|
||||
|
||||
def copy(self):
|
||||
for f, d in self.file_map.items():
|
||||
rro_file = os.path.join(
|
||||
self.copy_dir, self.partition, d)
|
||||
rro_dir = os.path.dirname(rro_file)
|
||||
if not os.path.exists(rro_dir):
|
||||
os.makedirs(rro_dir)
|
||||
shutil.copyfile(os.path.join(self.extract_to, f), rro_file)
|
||||
|
||||
+4
-4
@@ -15,10 +15,10 @@ class Gapps(General):
|
||||
"armeabi-v7a": ["https://sourceforge.net/projects/opengapps/files/arm/20220215/open_gapps-arm-11.0-pico-20220215.zip", "8719519fa32ae83a62621c6056d32814"]
|
||||
},
|
||||
"13": {
|
||||
"x86_64": ["https://github.com/s1204IT/MindTheGappsBuilder/releases/download/20231028/MindTheGapps-13.0.0-x86_64-20231028.zip", "63ccebbf93d45c384f58d7c40049d398"],
|
||||
"x86": ["https://github.com/s1204IT/MindTheGappsBuilder/releases/download/20231028/MindTheGapps-13.0.0-x86-20231028.zip", "f12b6a8ed14eedbb4b5b3c932a865956"],
|
||||
"arm64-v8a": ["https://github.com/s1204IT/MindTheGappsBuilder/releases/download/20231028/MindTheGapps-13.0.0-arm64-20231028.zip", "11180da0a5d9f2ed2863882c30a8d556"],
|
||||
"armeabi-v7a": ["https://github.com/s1204IT/MindTheGappsBuilder/releases/download/20231028/MindTheGapps-13.0.0-arm-20231028.zip", "d525c980bac427844aa4cb01628f8a8f"]
|
||||
"x86_64": ["https://github.com/Howard20181/MindTheGappsBuilder/releases/download/20230323/MindTheGapps-13.0.0-x86_64-20230323.zip", "aba427be1ddd0963121c87a4eda80299"],
|
||||
"x86": ["https://github.com/Howard20181/MindTheGappsBuilder/releases/download/20230323/MindTheGapps-13.0.0-x86-20230323.zip", "f02d2f1a3f0a084f13ab4c1b58ad7554"],
|
||||
"arm64-v8a": ["https://github.com/Howard20181/MindTheGappsBuilder/releases/download/20230323/MindTheGapps-13.0.0-arm64-20230323.zip", "18484a5622eeccffcea2b43205655d8a"],
|
||||
"armeabi-v7a": ["https://github.com/Howard20181/MindTheGappsBuilder/releases/download/20230323/MindTheGapps-13.0.0-arm-20230323.zip", "e4c00a7eb1e4dfca0fc6a3e447710264"]
|
||||
}
|
||||
}
|
||||
android_version = ...
|
||||
|
||||
+2
-2
@@ -10,7 +10,7 @@ class Houdini(General):
|
||||
partition = "system"
|
||||
dl_links = {
|
||||
"11": ["https://github.com/supremegamers/vendor_intel_proprietary_houdini/archive/81f2a51ef539a35aead396ab7fce2adf89f46e88.zip", "fbff756612b4144797fbc99eadcb6653"],
|
||||
"13": ["https://github.com/supremegamers/vendor_intel_proprietary_houdini/archive/9e77896350caccd228b36b2e1b4a994aa4bd48da.zip", "3807fe029559db3037efe245d9e74270"]
|
||||
# "13": ["https://github.com/supremegamers/vendor_intel_proprietary_houdini/archive/978d8cba061a08837b7e520cd03b635af643ba08.zip", "1e139054c05034648fae58a1810573b4"]
|
||||
}
|
||||
act_md5 = ...
|
||||
dl_link = ...
|
||||
@@ -18,7 +18,7 @@ class Houdini(General):
|
||||
extract_to = "/tmp/houdiniunpack"
|
||||
init_rc_component = """
|
||||
on early-init
|
||||
mount binfmt_misc binfmt_misc /proc/sys/fs/binfmt_misc
|
||||
mount -t binfmt_misc binfmt_misc /proc/sys/fs/binfmt_misc
|
||||
|
||||
on property:ro.enable.native.bridge.exec=1
|
||||
exec -- /system/bin/sh -c "echo ':arm_exe:M::\\\\x7f\\\\x45\\\\x4c\\\\x46\\\\x01\\\\x01\\\\x01\\\\x00\\\\x00\\\\x00\\\\x00\\\\x00\\\\x00\\\\x00\\\\x00\\\\x00\\\\x02\\\\x00\\\\x28::/system/bin/houdini:P' > /proc/sys/fs/binfmt_misc/register"
|
||||
|
||||
+18
-37
@@ -10,7 +10,7 @@ from tools import container
|
||||
class Magisk(General):
|
||||
id = "magisk delta"
|
||||
partition = "system"
|
||||
dl_link = "https://github.com/mistrmochov/magiskdeltaorig/raw/main/app-release.apk"
|
||||
dl_link = "https://huskydg.github.io/magisk-files/app-debug.apk"
|
||||
dl_file_name = "magisk.apk"
|
||||
extract_to = "/tmp/magisk_unpack"
|
||||
magisk_dir = os.path.join(partition, "etc", "init", "magisk")
|
||||
@@ -29,28 +29,30 @@ service bootanim /system/bin/bootanimation
|
||||
bootanim_component = f"""
|
||||
on post-fs-data
|
||||
start logd
|
||||
exec u:r:su:s0 root root -- /system/etc/init/magisk/magiskpolicy --live --magisk
|
||||
exec u:r:magisk:s0 root root -- /system/etc/init/magisk/magiskpolicy --live --magisk
|
||||
exec u:r:update_engine:s0 root root -- /system/etc/init/magisk/magiskpolicy --live --magisk
|
||||
mkdir /dev/magisk_iqeoVo2mDrO 700
|
||||
exec u:r:su:s0 root root -- /system/etc/init/magisk/magisk64 --auto-selinux --setup-sbin /system/etc/init/magisk /dev/magisk_iqeoVo2mDrO
|
||||
exec u:r:su:s0 root root -- /dev/magisk_iqeoVo2mDrO/magisk --auto-selinux --post-fs-data
|
||||
exec u:r:su:s0 root root -- /system/etc/init/magisk/magisk{host()[1]} --auto-selinux --setup-sbin /system/etc/init/magisk
|
||||
exec u:r:su:s0 root root -- /system/etc/init/magisk/magiskpolicy --live --magisk "allow * magisk_file lnk_file *"
|
||||
mkdir /sbin/.magisk 700
|
||||
mkdir /sbin/.magisk/mirror 700
|
||||
mkdir /sbin/.magisk/block 700
|
||||
copy /system/etc/init/magisk/config /sbin/.magisk/config
|
||||
rm /dev/.magisk_unblock
|
||||
exec u:r:su:s0 root root -- /sbin/magisk --auto-selinux --post-fs-data
|
||||
wait /dev/.magisk_unblock 40
|
||||
rm /dev/.magisk_unblock
|
||||
|
||||
on nonencrypted
|
||||
exec u:r:su:s0 root root -- /dev/magisk_iqeoVo2mDrO/magisk --auto-selinux --service
|
||||
|
||||
on property:vold.decrypt=trigger_restart_framework
|
||||
exec u:r:su:s0 root root -- /dev/magisk_iqeoVo2mDrO/magisk --auto-selinux --service
|
||||
on zygote-start
|
||||
exec u:r:su:s0 root root -- /sbin/magisk --auto-selinux --service
|
||||
|
||||
on property:sys.boot_completed=1
|
||||
mkdir /data/adb/magisk 755
|
||||
exec u:r:su:s0 root root -- /dev/magisk_iqeoVo2mDrO/magisk --auto-selinux --boot-complete
|
||||
exec u:r:su:s0 root root -- /sbin/magisk --auto-selinux --boot-complete
|
||||
exec -- /system/bin/sh -c "if [ ! -e /data/data/io.github.huskydg.magisk ] ; then pm install /system/etc/init/magisk/magisk.apk ; fi"
|
||||
|
||||
on property:init.svc.zygote=restarting
|
||||
exec u:r:su:s0 root root -- /dev/magisk_iqeoVo2mDrO/magisk --auto-selinux --zygote-restart
|
||||
exec u:r:su:s0 root root -- /sbin/magisk --auto-selinux --zygote-restart
|
||||
|
||||
on property:init.svc.zygote=stopped
|
||||
exec u:r:su:s0 root root -- /dev/magisk_iqeoVo2mDrO/magisk --auto-selinux --zygote-restart
|
||||
exec u:r:su:s0 root root -- /sbin/magisk --auto-selinux --zygote-restart
|
||||
"""
|
||||
|
||||
def download(self):
|
||||
@@ -64,28 +66,7 @@ on property:init.svc.zygote=stopped
|
||||
Logger.info("Additional setup")
|
||||
magisk_absolute_dir = os.path.join(self.copy_dir, self.magisk_dir)
|
||||
data_dir = get_data_dir()
|
||||
data_magisk_dir = os.path.join(data_dir, "adb", "magisk")
|
||||
shutil.copytree(magisk_absolute_dir, data_magisk_dir, dirs_exist_ok=True)
|
||||
|
||||
# General.install() calls set_perm() only over self.files, which are paths
|
||||
# under copy_dir (the overlay). This /data/adb copy is made here, before
|
||||
# that runs, so it keeps the 0644 the binaries inherited from the apk
|
||||
# extraction. A non-executable /data/adb/magisk/magisk64 makes magisk_env()
|
||||
# abort at post-fs-data: root still works from the overlay copy, but Zygisk
|
||||
# silently never initialises (Magisk reports "Zygisk: No" no matter what
|
||||
# the zygisk setting says). Apply the same perms set_path_perm() gives
|
||||
# magisk paths, to this copy too.
|
||||
self.set_data_magisk_perm(data_magisk_dir)
|
||||
|
||||
def set_data_magisk_perm(self, data_magisk_dir):
|
||||
if not os.path.isdir(data_magisk_dir):
|
||||
return
|
||||
os.chmod(data_magisk_dir, 0o755)
|
||||
for root, dirnames, filenames in os.walk(data_magisk_dir):
|
||||
for dirname in dirnames:
|
||||
os.chmod(os.path.join(root, dirname), 0o755)
|
||||
for filename in filenames:
|
||||
os.chmod(os.path.join(root, filename), 0o755)
|
||||
shutil.copytree(magisk_absolute_dir, os.path.join(data_dir, "adb", "magisk"), dirs_exist_ok=True)
|
||||
|
||||
def copy(self):
|
||||
magisk_absolute_dir = os.path.join(self.copy_dir, self.magisk_dir)
|
||||
|
||||
+3
-3
@@ -9,12 +9,12 @@ class Ndk(General):
|
||||
partition = "system"
|
||||
dl_links = {
|
||||
"11": ["https://github.com/supremegamers/vendor_google_proprietary_ndk_translation-prebuilt/archive/9324a8914b649b885dad6f2bfd14a67e5d1520bf.zip", "c9572672d1045594448068079b34c350"],
|
||||
"13": ["https://github.com/supremegamers/vendor_google_proprietary_ndk_translation-prebuilt/archive/68734c52556d3d7a6db34c603dd9276915c29f2f.zip", "0b2207c490fcb400aa5c87fcf0d52d38"]
|
||||
"13": ["https://github.com/supremegamers/vendor_google_proprietary_ndk_translation-prebuilt/archive/a090003c60df53a9eadb2df09bd4fd2fa86ea629.zip", "e6f0d9fc28ebc427b59a3942a9a4ffc0"]
|
||||
}
|
||||
dl_file_name = "libndktranslation.zip"
|
||||
extract_to = "/tmp/libndkunpack"
|
||||
apply_props = {
|
||||
"ro.product.cpu.abilist": "x86_64,x86,arm64-v8a,armeabi-v7a,armeabi",
|
||||
"ro.product.cpu.abilist": "x86_64,x86,armeabi-v7a,armeabi,arm64-v8a",
|
||||
"ro.product.cpu.abilist32": "x86,armeabi-v7a,armeabi",
|
||||
"ro.product.cpu.abilist64": "x86_64,arm64-v8a",
|
||||
"ro.dalvik.vm.native.bridge": "libndk_translation.so",
|
||||
@@ -49,4 +49,4 @@ class Ndk(General):
|
||||
Logger.info("Copying libndk library files ...")
|
||||
name = re.findall("([a-zA-Z0-9]+)\.zip", self.dl_link)[0]
|
||||
shutil.copytree(os.path.join(self.extract_to, "vendor_google_proprietary_ndk_translation-prebuilt-" + name,
|
||||
"prebuilts"), os.path.join(self.copy_dir, self.partition), dirs_exist_ok=True)
|
||||
"prebuilts"), os.path.join(self.copy_dir, self.partition), dirs_exist_ok=True)
|
||||
+6
-14
@@ -10,23 +10,19 @@ from tools import container
|
||||
class Nodataperm(General):
|
||||
id = "nodataperm"
|
||||
dl_links = {
|
||||
"11": {
|
||||
"x86_64": [
|
||||
"https://github.com/ayasa520/hack_full_data_permission/archive/d4beab7780eb792059d33e77d865579c9ee41546.zip",
|
||||
"b0e3908ffcf5df8ea62f4929aa680f1a"
|
||||
],
|
||||
},
|
||||
"13": {
|
||||
"11":
|
||||
{
|
||||
"x86_64": [
|
||||
"https://github.com/ayasa520/hack_full_data_permission/archive/d4beab7780eb792059d33e77d865579c9ee41546.zip",
|
||||
"b0e3908ffcf5df8ea62f4929aa680f1a"
|
||||
],
|
||||
},
|
||||
"13": {}
|
||||
}
|
||||
dl_file_name = "nodataperm.zip"
|
||||
extract_to = "/tmp/nodataperm"
|
||||
dl_link = None
|
||||
act_md5 = None
|
||||
dl_link = ...
|
||||
act_md5 = ...
|
||||
partition = "system"
|
||||
files = [
|
||||
"etc/nodataperm.sh",
|
||||
@@ -40,15 +36,11 @@ class Nodataperm(General):
|
||||
super().__init__()
|
||||
print("ok")
|
||||
arch = self.arch[0]
|
||||
if android_version not in self.dl_links:
|
||||
raise KeyError(f"No download links for Android version '{android_version}'")
|
||||
if arch not in self.dl_links[android_version]:
|
||||
raise KeyError(f"No download links for architecture '{arch}' in Android version '{android_version}'")
|
||||
self.dl_link = self.dl_links[android_version][arch][0]
|
||||
self.act_md5 = self.dl_links[android_version][arch][1]
|
||||
|
||||
def copy(self):
|
||||
name = re.findall(r"([a-zA-Z0-9]+)\.zip", self.dl_link)[0]
|
||||
name = re.findall("([a-zA-Z0-9]+)\.zip", self.dl_link)[0]
|
||||
extract_path = os.path.join(
|
||||
self.extract_to, f"hack_full_data_permission-{name}")
|
||||
if not container.use_overlayfs():
|
||||
|
||||
+2
-13
@@ -13,8 +13,8 @@ class Widevine(General):
|
||||
"x86_64": {
|
||||
"11": ["https://github.com/supremegamers/vendor_google_proprietary_widevine-prebuilt/archive/48d1076a570837be6cdce8252d5d143363e37cc1.zip",
|
||||
"f587b8859f9071da4bca6cea1b9bed6a"],
|
||||
"13": ["https://github.com/WayDroid-ATV/vendor_google_proprietary_widevine-prebuilt/archive/679552343d8b2e8d7a19b6df61c7a03963d0c75b.zip",
|
||||
"80ab79ea85c7b2556baedb371a54e01c"]
|
||||
"13": ["https://github.com/supremegamers/vendor_google_proprietary_widevine-prebuilt/archive/a8524d608431573ef1c9313822d271f78728f9a6.zip",
|
||||
"5c55df61da5c012b4e43746547ab730f"]
|
||||
},
|
||||
# "armeabi-v7a": ["https://github.com/supremegamers/vendor_google_proprietary_widevine-prebuilt/archive/a1a19361d36311bee042da8cf4ced798d2c76d98.zip", "fed6898b5cfd2a908cb134df97802554"],
|
||||
"arm64-v8a": {
|
||||
@@ -30,10 +30,7 @@ class Widevine(General):
|
||||
"etc/init/*widevine.rc",
|
||||
"etc/vintf/manifest/*widevine.xml",
|
||||
"lib/libwvhidl.so",
|
||||
"lib/libwvaidl.so",
|
||||
"lib/mediadrm",
|
||||
"lib64/libwvhidl.so",
|
||||
"lib64/libwvaidl.so",
|
||||
"lib64/mediadrm"
|
||||
]
|
||||
|
||||
@@ -41,17 +38,9 @@ class Widevine(General):
|
||||
super().__init__()
|
||||
self.dl_link = self.dl_links[self.arch[0]][android_version][0]
|
||||
self.act_md5 = self.dl_links[self.arch[0]][android_version][1]
|
||||
self.android_version = android_version
|
||||
self.libdir = "lib64" if self.arch[1] == 64 else "lib"
|
||||
|
||||
def copy(self):
|
||||
name = re.findall("([a-zA-Z0-9]+)\.zip", self.dl_link)[0]
|
||||
Logger.info("Copying widevine library files ...")
|
||||
shutil.copytree(os.path.join(self.extract_to, "vendor_google_proprietary_widevine-prebuilt-"+name,
|
||||
"prebuilts"), os.path.join(self.copy_dir, self.partition), dirs_exist_ok=True)
|
||||
if self.android_version == "13":
|
||||
try:
|
||||
os.symlink("libprotobuf-cpp-lite-3.9.1.so",
|
||||
os.path.join(self.copy_dir, self.partition, self.libdir, "libprotobuf-cpp-lite.so"))
|
||||
except FileExistsError:
|
||||
pass
|
||||
|
||||
@@ -1,179 +0,0 @@
|
||||
#!/usr/bin/env python3
|
||||
"""Regression test for Magisk.setup() permissions on the /data/adb/magisk copy.
|
||||
|
||||
install() runs copy() -> extra1() -> set_perm(). set_perm() only walks self.files,
|
||||
which are paths under copy_dir (the overlay), so the copy that setup() makes into
|
||||
<data>/adb/magisk keeps the 0644 the binaries inherit from the apk extraction.
|
||||
|
||||
A non-executable /data/adb/magisk/magisk64 makes magisk_env() abort at post-fs-data.
|
||||
Root still works (it runs from the overlay copy), but Zygisk never initialises and
|
||||
the Magisk app reports "Zygisk: No" with no error explaining why.
|
||||
|
||||
Runs as an ordinary user, needs no Waydroid install and no extra dependencies:
|
||||
|
||||
python3 tests/test_magisk_setup_perms.py
|
||||
"""
|
||||
|
||||
import os
|
||||
import shutil
|
||||
import stat
|
||||
import sys
|
||||
import tempfile
|
||||
|
||||
sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
|
||||
|
||||
import stuff.magisk as magisk_module
|
||||
from stuff.magisk import Magisk
|
||||
|
||||
MAGISK_BINARIES = [
|
||||
"magisk64",
|
||||
"magiskinit",
|
||||
"magiskboot",
|
||||
"magiskpolicy",
|
||||
"busybox",
|
||||
"util_functions.sh",
|
||||
]
|
||||
|
||||
|
||||
def make_overlay(base):
|
||||
"""Mimic the tree copy() leaves behind: binaries written 0644 by shutil.copyfile."""
|
||||
magisk_dir = os.path.join(base, "system", "etc", "init", "magisk")
|
||||
os.makedirs(os.path.join(magisk_dir, "chromeos"), exist_ok=True)
|
||||
for name in MAGISK_BINARIES:
|
||||
path = os.path.join(magisk_dir, name)
|
||||
with open(path, "wb") as f:
|
||||
f.write(b"\x7fELF placeholder")
|
||||
os.chmod(path, 0o644)
|
||||
nested = os.path.join(magisk_dir, "chromeos", "futility")
|
||||
with open(nested, "wb") as f:
|
||||
f.write(b"placeholder")
|
||||
os.chmod(nested, 0o644)
|
||||
return magisk_dir
|
||||
|
||||
|
||||
def file_modes(root):
|
||||
modes = {}
|
||||
for dirpath, _dirnames, filenames in os.walk(root):
|
||||
for name in filenames:
|
||||
path = os.path.join(dirpath, name)
|
||||
modes[os.path.relpath(path, root)] = stat.S_IMODE(os.stat(path).st_mode)
|
||||
return modes
|
||||
|
||||
|
||||
def test_plain_copytree_loses_exec_bit():
|
||||
"""Document the original behaviour: a bare copytree leaves the binaries 0644."""
|
||||
base = tempfile.mkdtemp()
|
||||
try:
|
||||
src = make_overlay(base)
|
||||
dst = os.path.join(base, "data", "adb", "magisk")
|
||||
os.makedirs(os.path.dirname(dst), exist_ok=True)
|
||||
shutil.copytree(src, dst, dirs_exist_ok=True)
|
||||
|
||||
modes = file_modes(dst)
|
||||
assert modes["magisk64"] == 0o644, (
|
||||
"expected the pre-fix behaviour to reproduce, got %o" % modes["magisk64"]
|
||||
)
|
||||
finally:
|
||||
shutil.rmtree(base, ignore_errors=True)
|
||||
|
||||
|
||||
def test_setup_makes_data_copy_executable():
|
||||
"""setup() must leave every file and dir in <data>/adb/magisk executable."""
|
||||
base = tempfile.mkdtemp()
|
||||
try:
|
||||
make_overlay(base)
|
||||
data_dir = os.path.join(base, "data")
|
||||
os.makedirs(data_dir, exist_ok=True)
|
||||
|
||||
original_get_data_dir = magisk_module.get_data_dir
|
||||
original_info = magisk_module.Logger.info
|
||||
magisk_module.get_data_dir = lambda: data_dir
|
||||
magisk_module.Logger.info = lambda *a, **k: None
|
||||
|
||||
class StubMagisk(Magisk):
|
||||
@property
|
||||
def copy_dir(self):
|
||||
return base
|
||||
|
||||
try:
|
||||
StubMagisk().setup()
|
||||
finally:
|
||||
magisk_module.get_data_dir = original_get_data_dir
|
||||
magisk_module.Logger.info = original_info
|
||||
|
||||
dst = os.path.join(data_dir, "adb", "magisk")
|
||||
modes = file_modes(dst)
|
||||
assert modes, "setup() copied nothing"
|
||||
|
||||
not_executable = {n: oct(m) for n, m in modes.items() if m != 0o755}
|
||||
assert not not_executable, "files left non-0755: %s" % not_executable
|
||||
|
||||
assert stat.S_IMODE(os.stat(dst).st_mode) == 0o755
|
||||
nested = os.path.join(dst, "chromeos")
|
||||
assert stat.S_IMODE(os.stat(nested).st_mode) == 0o755, "nested dir not fixed"
|
||||
finally:
|
||||
shutil.rmtree(base, ignore_errors=True)
|
||||
|
||||
|
||||
def test_setup_is_idempotent():
|
||||
base = tempfile.mkdtemp()
|
||||
try:
|
||||
make_overlay(base)
|
||||
data_dir = os.path.join(base, "data")
|
||||
os.makedirs(data_dir, exist_ok=True)
|
||||
|
||||
original_get_data_dir = magisk_module.get_data_dir
|
||||
original_info = magisk_module.Logger.info
|
||||
magisk_module.get_data_dir = lambda: data_dir
|
||||
magisk_module.Logger.info = lambda *a, **k: None
|
||||
|
||||
class StubMagisk(Magisk):
|
||||
@property
|
||||
def copy_dir(self):
|
||||
return base
|
||||
|
||||
try:
|
||||
StubMagisk().setup()
|
||||
StubMagisk().setup()
|
||||
finally:
|
||||
magisk_module.get_data_dir = original_get_data_dir
|
||||
magisk_module.Logger.info = original_info
|
||||
|
||||
dst = os.path.join(data_dir, "adb", "magisk")
|
||||
assert all(m == 0o755 for m in file_modes(dst).values())
|
||||
finally:
|
||||
shutil.rmtree(base, ignore_errors=True)
|
||||
|
||||
|
||||
def test_perm_helper_tolerates_missing_dir():
|
||||
Magisk().set_data_magisk_perm(os.path.join(tempfile.gettempdir(), "definitely-not-here"))
|
||||
|
||||
|
||||
def main():
|
||||
tests = [
|
||||
test_plain_copytree_loses_exec_bit,
|
||||
test_setup_makes_data_copy_executable,
|
||||
test_setup_is_idempotent,
|
||||
test_perm_helper_tolerates_missing_dir,
|
||||
]
|
||||
failed = 0
|
||||
for test in tests:
|
||||
try:
|
||||
test()
|
||||
except AssertionError as exc:
|
||||
failed += 1
|
||||
print("FAIL %s: %s" % (test.__name__, exc))
|
||||
except Exception as exc: # noqa: BLE001 - surface anything unexpected
|
||||
failed += 1
|
||||
print("ERROR %s: %r" % (test.__name__, exc))
|
||||
else:
|
||||
print("ok %s" % test.__name__)
|
||||
if failed:
|
||||
print("\n%d test(s) failed" % failed)
|
||||
return 1
|
||||
print("\nall %d tests passed" % len(tests))
|
||||
return 0
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
sys.exit(main())
|
||||
Reference in New Issue
Block a user