wbruno/waydroid_script
1
0
Fork 0
Code Issues 122 Pull Requests 24 Actions Packages Projects Releases Wiki Activity

Fix typos, reformat Markdown, and use sentence case consistently #175

Open
Kazevic wants to merge 4 commits from Kazevic/patch-1 into main
pull from: Kazevic/patch-1
merge into: :main
Conversation 1 Commits 4 Files Changed 19
+226 -155
19 changed files with 226 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files
README.md
+53 -37
View File
@@ -20,9 +20,7 @@ sudo venv/bin/python3 main.py
![image-20230430013148814](assets/img/README/image-20230430013148814.png) ![image-20230430013148814](assets/img/README/image-20230430013148814.png)
## Command line
## Command Line
```bash ```bash
git clone https://github.com/casualsnek/waydroid_script git clone https://github.com/casualsnek/waydroid_script
@@ -42,38 +40,49 @@ sudo venv/bin/python3 main.py hack {nodataperm, hidestatusbar}
## Dependencies ## Dependencies
"lzip" is required for this script to work, install it using your distribution's package manager: "lzip" is required for this script to work, install it using your distribution's package manager:
### Arch, Manjaro and EndeavourOS based distributions:
### Arch, Manjaro, and EndeavourOS-based distributions:
sudo pacman -S lzip sudo pacman -S lzip
### Debian and Ubuntu based distributions:
### Debian and Ubuntu-based distributions:
sudo apt install lzip sudo apt install lzip
### RHEL, Fedora and Rocky based distributions:
### RHEL, Fedora, and Rocky-based distributions:
sudo dnf install lzip sudo dnf install lzip
### openSUSE based distributions:
### openSUSE-based distributions:
sudo zypper install lzip sudo zypper install lzip
## Install OpenGapps ## Install Open GApps
![](assets/1.png) ![](assets/1.png)
Open terminal and switch to the directory where "main.py" is located then run: Open the terminal and switch to the directory where "main.py" is located, then run:
sudo venv/bin/python3 main.py install gapps sudo venv/bin/python3 main.py install gapps
Then launch waydroid with: Then launch Waydroid with:
waydroid show-full-ui waydroid show-full-ui
After waydroid has finished booting, open terminal and switch to directory where "main.py" is located then run: After Waydroid has finished booting, open the terminal and switch to the directory where "main.py" is located, then run:
sudo python3 main.py google sudo python3 main.py google
Copy the returned numeric ID, then open ["https://google.com/android/uncertified/?pli=1"](https://google.com/android/uncertified/?pli=1). Enter the ID and register it. Wait 10-20 minutes for device to get registered. Then clear Google Play Service's cache and try logging in!
Copy the returned numeric ID, then
open ["https://google.com/android/uncertified/?pli=1"](https://google.com/android/uncertified/?pli=1). Enter the ID and
register it. Wait 10–20 minutes for the device to get registered. Then clear Google Play Service's cache and try logging
in!
## Install Magisk ## Install Magisk
![](assets/2.png) ![](assets/2.png)
Open terminal and switch to directory where "main.py" is located then run: Open the terminal and switch to the directory where "main.py" is located, then run:
sudo venv/bin/python3 main.py install magisk sudo venv/bin/python3 main.py install magisk
@@ -81,21 +90,22 @@ Magisk will be installed on next boot!
Zygisk and modules like LSPosed should work now. Zygisk and modules like LSPosed should work now.
If you want to update Magisk, Please use `Direct Install into system partition` or run this sript again. If you want to update Magisk, Please use `Direct Install into system partition` or run this script again.
This script only focuses on Magisk installation, if you need more management, please check https://github.com/nitanmarcel/waydroid-magisk This script only focuses on Magisk installation, if you need more management, please
check https://github.com/nitanmarcel/waydroid-magisk
## Install libndk arm translation ## Install libndk ARM translation
libndk_translation from guybrush firmware. libndk_translation from guybrush firmware.
libndk seems to have better performance than libhoudini on AMD. libndk seems to have better performance than libhoudini on AMD.
Open terminal and switch to directory where "main.py" is located then run: Open the terminal and switch to the directory where "main.py" is located, then run:
sudo venv/bin/python3 main.py install libndk sudo venv/bin/python3 main.py install libndk
## Install libhoudini arm translation ## Install libhoudini ARM translation
Intel's libhoudini for intel/AMD x86 CPU, pulled from Microsoft's WSA 11 image Intel's libhoudini for intel/AMD x86 CPU, pulled from Microsoft's WSA 11 image
@@ -103,7 +113,7 @@ houdini version: 11.0.1b_y.38765.m
houdini64 version: 11.0.1b_z.38765.m houdini64 version: 11.0.1b_z.38765.m
Open terminal and switch to directory where "main.py" is located then run: Open the terminal and switch to the directory where "main.py" is located, then run:
sudo venv/bin/python3 main.py install libhoudini sudo venv/bin/python3 main.py install libhoudini
@@ -111,7 +121,7 @@ Open terminal and switch to directory where "main.py" is located then run:
![](assets/3.png) ![](assets/3.png)
Open terminal and switch to directory where "main.py" is located then run: Open the terminal and switch to the directory where "main.py" is located, then run:
sudo venv/bin/python3 main.py install widevine sudo venv/bin/python3 main.py install widevine
@@ -120,34 +130,38 @@ Open terminal and switch to directory where "main.py" is located then run:
![](assets/4.png) ![](assets/4.png)
![](assets/5.png) ![](assets/5.png)
Open terminal and switch to directory where "main.py" is located then run: Open the terminal and switch to the directory where "main.py" is located, then run:
sudo venv/bin/python3 main.py install smartdock sudo venv/bin/python3 main.py install smartdock
## Install a self-signed CA certificate ## Install a self-signed CA certificate
Open terminal and switch to directory where "main.py" is located then run: Open the terminal and switch to the directory where "main.py" is located, then run:
sudo venv/bin/python3 main.py install mitm --ca-cert mycert.pem sudo venv/bin/python3 main.py install mitm --ca-cert mycert.pem
## Granting full permission for apps data (HACK) ## Granting full permission for apps data (HACK)
This is a temporary hack to combat against the apps permission issue on Android 11. Whenever an app is open, it will
always enable a property (persist.sys.nodataperm) to make it execute a script to grant the data full permissions (777).
The **correct** way is to use `sdcardfs` or `esdfs`, both need to recompile the kernel or WayDroid image.
This is a temporary hack to combat against the apps permission issue on Android 11. Whenever an app is open it will always enable a property (persist.sys.nodataperm) to make it execute a script to grant the data full permissions (777). The **correct** way is to use `sdcardfs` or `esdfs`, both need to recompile the kernel or WayDroid image. Arknights, PUNISHING: GRAY RAVEN, and other games won't freeze on the black screen.
Arknights, PUNISHING: GRAY RAVEN and other games won't freeze on the black screen.
![](assets/6.png) ![](assets/6.png)
Open terminal and switch to directory where "main.py" is located then run: Open the terminal and switch to the directory where "main.py" is located, then run:
``` ```
sudo venv/bin/python3 main.py hack nodataperm sudo venv/bin/python3 main.py hack nodataperm
``` ```
**WARNING**: Tested on `lineage-18.1-20230128-VANILLA-waydroid_x86_64.img`. This script will replace `/system/framework/service.jar`, which may prevent WayDroid from booting. If so, run `sudo venv/bin/python3 main.py uninstall nodataperm` to remove it.
**WARNING**: Tested on `lineage-18.1-20230128-VANILLA-waydroid_x86_64.img`. This script will
replace `/system/framework/service.jar`, which may prevent Waydroid from booting. If so,
run `sudo venv/bin/python3 main.py uninstall nodataperm` to remove it.
Or you can run the following commands directly in `sudo waydroid shell`. In this way, every time a new game is installed, you need to run it again, but it's much less risky. Or you can run the following commands directly in `sudo waydroid shell`. In this way, every time a new game is
installed, you need to run it again, but it is much less risky.
``` ```
chmod 777 -R /sdcard/Android chmod 777 -R /sdcard/Android
@@ -161,7 +175,7 @@ chmod 777 -R /mnt/*/*/*/*/Android/obb
- https://github.com/supremegamers/device_generic_common/commit/2d47891376c96011b2ee3c1ccef61cb48e15aed6 - https://github.com/supremegamers/device_generic_common/commit/2d47891376c96011b2ee3c1ccef61cb48e15aed6
- https://github.com/supremegamers/android_frameworks_base/commit/24a08bf800b2e461356a9d67d04572bb10b0e819 - https://github.com/supremegamers/android_frameworks_base/commit/24a08bf800b2e461356a9d67d04572bb10b0e819
## Install microG, Aurora Store and Aurora Droid ## Install microG, Aurora Store, and Aurora Droid
![](assets/7.png) ![](assets/7.png)
@@ -169,7 +183,8 @@ chmod 777 -R /mnt/*/*/*/*/Android/obb
sudo venv/bin/python3 main.py install microg sudo venv/bin/python3 main.py install microg
``` ```
## Hide Status Bar ## Hide status bar
Before Before
![Before](assets/8.png) ![Before](assets/8.png)
@@ -180,15 +195,15 @@ After
sudo venv/bin/python3 main.py hack hidestatusbar sudo venv/bin/python3 main.py hack hidestatusbar
``` ```
## Get Android ID for device registration ## Get Android ID for device registration
You need to register you device with its it before being able to use gapps, this will print out your Android ID which you can use for device registration required for Google apps: You need to register your device with its ID before being able to use GApps, this will print out your Android ID, which
Open terminal and switch to directory where "main.py" is located then run: you can use for device registration required for Google apps:
Open the terminal and switch to the directory where "main.py" is located, then run:
sudo venv/bin/python3 main.py certified sudo venv/bin/python3 main.py certified
Star this repository if you find this useful, if you encounter problem create an issue on GitHub! Star this repository if you find this useful, if you encounter a problem, create an issue on GitHub!
## Error handling ## Error handling
@@ -197,9 +212,10 @@ Star this repository if you find this useful, if you encounter problem create an
Check [waydroid-magisk](https://github.com/nitanmarcel/waydroid-magisk) Check [waydroid-magisk](https://github.com/nitanmarcel/waydroid-magisk)
## Credits ## Credits
- [WayDroid](https://github.com/waydroid/waydroid)
- [Magisk Delta](https://huskydg.github.io/magisk-files/) - [Waydroid](https://github.com/waydroid/waydroid)
- [Magisk Delta](https://huskydg.github.io/magisk-files)
- [microG Project](https://microg.org) - [microG Project](https://microg.org)
- [Open GApps](https://opengapps.org) - [Open GApps](https://opengapps.org)
- [Smart Dock](https://github.com/axel358/smartdock) - [Smart Dock](https://github.com/axel358/smartdock)
- [wd-scripts](https://github.com/electrikjesus/wd-scripts/) - [wd-scripts](https://github.com/electrikjesus/wd-scripts)
main.py
+18 -21
View File
@@ -1,11 +1,14 @@
#!/usr/bin/env python3 #!/usr/bin/env python3
from InquirerPy import inquirer
from InquirerPy.base.control import Choice
from InquirerPy.separator import Separator
import argparse import argparse
import os import os
from typing import List from typing import List
from InquirerPy import inquirer
from InquirerPy.base.control import Choice
import tools.helper as helper
from stuff.android_id import AndroidId from stuff.android_id import AndroidId
from stuff.fdroidpriv import FDroidPriv
from stuff.gapps import Gapps from stuff.gapps import Gapps
from stuff.general import General from stuff.general import General
from stuff.hidestatusbar import HideStatusBar from stuff.hidestatusbar import HideStatusBar
@@ -17,13 +20,8 @@ from stuff.ndk import Ndk
from stuff.nodataperm import Nodataperm from stuff.nodataperm import Nodataperm
from stuff.smartdock import Smartdock from stuff.smartdock import Smartdock
from stuff.widevine import Widevine from stuff.widevine import Widevine
from stuff.fdroidpriv import FDroidPriv
import tools.helper as helper
from tools import container from tools import container
from tools import images from tools import images
import argparse
from tools.logger import Logger from tools.logger import Logger
@@ -32,7 +30,7 @@ def get_certified(args):
def mount(partition, copy_dir): def mount(partition, copy_dir):
img = os.path.join(images.get_image_dir(), partition+".img") img = os.path.join(images.get_image_dir(), partition + ".img")
mount_point = "" mount_point = ""
if partition == "system": if partition == "system":
mount_point = os.path.join(copy_dir) mount_point = os.path.join(copy_dir)
@@ -43,9 +41,9 @@ def mount(partition, copy_dir):
def resize(partition): def resize(partition):
img = os.path.join(images.get_image_dir(), partition+".img") img = os.path.join(images.get_image_dir(), partition + ".img")
img_size = int(os.path.getsize(img)/(1024*1024)) img_size = int(os.path.getsize(img) / (1024 * 1024))
new_size = "{}M".format(img_size+500) new_size = "{}M".format(img_size + 500)
Logger.info("Resizing {} to {}".format(img, new_size)) Logger.info("Resizing {} to {}".format(img, new_size))
images.resize(img, new_size) images.resize(img, new_size)
@@ -262,7 +260,7 @@ def interact():
choices=[*install_choices, *hack_choices] choices=[*install_choices, *hack_choices]
).execute() ).execute()
args.app = apps args.app = apps
args.microg_variant="Standard" args.microg_variant = "Standard"
remove_app(args) remove_app(args)
elif action == "Hack": elif action == "Hack":
apps = inquirer.checkbox( apps = inquirer.checkbox(
@@ -279,9 +277,8 @@ def interact():
def main(): def main():
parser = argparse.ArgumentParser(description=''' parser = argparse.ArgumentParser(description='''Does stuff like installing Aapps, installing Magisk, installing
Does stuff like installing Gapps, installing Magisk, installing NDK Translation and getting Android ID for device registration. NDK Translation, and getting Android ID for device registration. Use -h flag for help!''')
Use -h flag for help!''')
subparsers = parser.add_subparsers(title="coomand", dest='command') subparsers = parser.add_subparsers(title="coomand", dest='command')
parser.add_argument('-a', '--android-version', parser.add_argument('-a', '--android-version',
@@ -310,10 +307,10 @@ def main():
install_help = """ install_help = """
gapps: Install Open GApps (Android 11) or MindTheGapps (Android 13) gapps: Install Open GApps (Android 11) or MindTheGapps (Android 13)
microg: Add microG, Aurora Store and Aurora Droid to WayDriod microg: Add microG, Aurora Store, and Aurora Droid to WayDroid
libndk: Add libndk arm translation, better for AMD CPUs libndk: Add libndk ARM translation, better for AMD CPUs
libhoudini: Add libhoudini arm translation, better for Intel CPUs libhoudini: Add libhoudini ARM translation, better for Intel CPUs
magisk: Install Magisk Delta to WayDroid magisk: Install Magisk Delta to Waydroid
mitm -c CA_CERT_FILE: Install root CA cert into system trust store mitm -c CA_CERT_FILE: Install root CA cert into system trust store
smartdock: A desktop mode launcher for Android smartdock: A desktop mode launcher for Android
widevine: Add support for widevine DRM L3 widevine: Add support for widevine DRM L3
@@ -333,7 +330,7 @@ widevine: Add support for widevine DRM L3
remove_parser = subparsers.add_parser( remove_parser = subparsers.add_parser(
'remove', aliases=["uninstall"], help='Remove an app') 'remove', aliases=["uninstall"], help='Remove an app')
remove_parser.add_argument( remove_parser.add_argument(
**arg_template, choices=[*remove_choices, * hack_choices], help='Name of app to remove') **arg_template, choices=[*remove_choices, *hack_choices], help='Name of app to remove')
remove_parser.set_defaults(func=remove_app) remove_parser.set_defaults(func=remove_app)
# hack and its aliases # hack and its aliases
stuff/fdroidpriv.py
+2 -1
View File
@@ -1,5 +1,6 @@
import os import os
import shutil import shutil
from stuff.general import General from stuff.general import General
@@ -26,6 +27,7 @@ class FDroidPriv(General):
"F-Droid.apk": "app/F-Droid/F-Droid.apk", "F-Droid.apk": "app/F-Droid/F-Droid.apk",
"F-DroidPrivilegedExtension.apk": "priv-app/F-DroidPrivilegedExtension/F-DroidPrivilegedExtension.apk", "F-DroidPrivilegedExtension.apk": "priv-app/F-DroidPrivilegedExtension/F-DroidPrivilegedExtension.apk",
} }
def __init__(self, android_version="11") -> None: def __init__(self, android_version="11") -> None:
super().__init__() super().__init__()
self.dl_link = self.dl_links[android_version][0] self.dl_link = self.dl_links[android_version][0]
@@ -39,4 +41,3 @@ class FDroidPriv(General):
if not os.path.exists(rro_dir): if not os.path.exists(rro_dir):
os.makedirs(rro_dir) os.makedirs(rro_dir)
shutil.copyfile(os.path.join(self.extract_to, f), rro_file) shutil.copyfile(os.path.join(self.extract_to, f), rro_file)
stuff/gapps.py
+31 -11
View File
@@ -1,5 +1,6 @@
import os import os
import shutil import shutil
from stuff.general import General from stuff.general import General
from tools.helper import run from tools.helper import run
@@ -9,16 +10,32 @@ class Gapps(General):
partition = "system" partition = "system"
dl_links = { dl_links = {
"11": { "11": {
"x86_64": ["https://sourceforge.net/projects/opengapps/files/x86_64/20220503/open_gapps-x86_64-11.0-pico-20220503.zip", "5a6d242be34ad1acf92899c7732afa1b"], "x86_64": [
"x86": ["https://sourceforge.net/projects/opengapps/files/x86/20220503/open_gapps-x86-11.0-pico-20220503.zip", "efda4943076016d00b40e0874b12ddd3"], "https://sourceforge.net/projects/opengapps/files/x86_64/20220503/open_gapps-x86_64-11.0-pico-20220503.zip",
"arm64-v8a": ["https://sourceforge.net/projects/opengapps/files/arm64/20220503/open_gapps-arm64-11.0-pico-20220503.zip", "7790055d34bbfc6fe610b0cd263a7add"], "5a6d242be34ad1acf92899c7732afa1b"],
"armeabi-v7a": ["https://sourceforge.net/projects/opengapps/files/arm/20220215/open_gapps-arm-11.0-pico-20220215.zip", "8719519fa32ae83a62621c6056d32814"] "x86": [
"https://sourceforge.net/projects/opengapps/files/x86/20220503/open_gapps-x86-11.0-pico-20220503.zip",
"efda4943076016d00b40e0874b12ddd3"],
"arm64-v8a": [
"https://sourceforge.net/projects/opengapps/files/arm64/20220503/open_gapps-arm64-11.0-pico-20220503.zip",
"7790055d34bbfc6fe610b0cd263a7add"],
"armeabi-v7a": [
"https://sourceforge.net/projects/opengapps/files/arm/20220215/open_gapps-arm-11.0-pico-20220215.zip",
"8719519fa32ae83a62621c6056d32814"]
}, },
"13": { "13": {
"x86_64": ["https://github.com/s1204IT/MindTheGappsBuilder/releases/download/20231028/MindTheGapps-13.0.0-x86_64-20231028.zip", "63ccebbf93d45c384f58d7c40049d398"], "x86_64": [
"x86": ["https://github.com/s1204IT/MindTheGappsBuilder/releases/download/20231028/MindTheGapps-13.0.0-x86-20231028.zip", "f12b6a8ed14eedbb4b5b3c932a865956"], "https://github.com/s1204IT/MindTheGappsBuilder/releases/download/20231028/MindTheGapps-13.0.0-x86_64-20231028.zip",
"arm64-v8a": ["https://github.com/s1204IT/MindTheGappsBuilder/releases/download/20231028/MindTheGapps-13.0.0-arm64-20231028.zip", "11180da0a5d9f2ed2863882c30a8d556"], "63ccebbf93d45c384f58d7c40049d398"],
"armeabi-v7a": ["https://github.com/s1204IT/MindTheGappsBuilder/releases/download/20231028/MindTheGapps-13.0.0-arm-20231028.zip", "d525c980bac427844aa4cb01628f8a8f"] "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"]
} }
} }
android_version = ... android_version = ...
@@ -124,7 +141,8 @@ class Gapps(General):
print(" Processing app package : " + print(" Processing app package : " +
os.path.join(self.extract_to, "Core", lz_file)) os.path.join(self.extract_to, "Core", lz_file))
run(["tar", "--lzip", "-xvf", os.path.join(self.extract_to, "Core", run(["tar", "--lzip", "-xvf", os.path.join(self.extract_to, "Core",
lz_file), "-C", os.path.join(self.extract_to, "appunpack")]) lz_file), "-C",
os.path.join(self.extract_to, "appunpack")])
app_name = os.listdir(os.path.join( app_name = os.listdir(os.path.join(
self.extract_to, "appunpack"))[0] self.extract_to, "appunpack"))[0]
xx_dpi = os.listdir(os.path.join( xx_dpi = os.listdir(os.path.join(
@@ -145,13 +163,15 @@ class Gapps(General):
print(" Processing extra package : " + print(" Processing extra package : " +
os.path.join(self.extract_to, "Core", lz_file)) os.path.join(self.extract_to, "Core", lz_file))
run(["tar", "--lzip", "-xvf", os.path.join(self.extract_to, "Core", run(["tar", "--lzip", "-xvf", os.path.join(self.extract_to, "Core",
lz_file), "-C", os.path.join(self.extract_to, "appunpack")]) lz_file), "-C",
os.path.join(self.extract_to, "appunpack")])
app_name = os.listdir(os.path.join( app_name = os.listdir(os.path.join(
self.extract_to, "appunpack"))[0] self.extract_to, "appunpack"))[0]
common_content_dirs = os.listdir(os.path.join( common_content_dirs = os.listdir(os.path.join(
self.extract_to, "appunpack", app_name, "common")) self.extract_to, "appunpack", app_name, "common"))
for ccdir in common_content_dirs: for ccdir in common_content_dirs:
shutil.copytree(os.path.join(self.extract_to, "appunpack", app_name, "common", ccdir), os.path.join( shutil.copytree(os.path.join(self.extract_to, "appunpack", app_name, "common", ccdir),
os.path.join(
self.copy_dir, self.partition, ccdir), dirs_exist_ok=True) self.copy_dir, self.partition, ccdir), dirs_exist_ok=True)
def copy_13(self): def copy_13(self):
stuff/general.py
+3 -2
View File
@@ -1,11 +1,12 @@
import configparser import configparser
import glob import glob
import hashlib
import os import os
import shutil import shutil
import zipfile import zipfile
import hashlib
from tools.helper import download_file, get_download_dir, host
from tools import container from tools import container
from tools.helper import download_file, get_download_dir, host
from tools.logger import Logger from tools.logger import Logger
stuff/hidestatusbar.py
+3 -1
View File
@@ -1,5 +1,6 @@
import os import os
import shutil import shutil
from stuff.general import General from stuff.general import General
@@ -12,8 +13,9 @@ class HideStatusBar(General):
dl_link = ... dl_link = ...
act_md5 = ... act_md5 = ...
files = [ files = [
"product/overlay/"+dl_file_name "product/overlay/" + dl_file_name
] ]
def __init__(self, android_version="11") -> None: def __init__(self, android_version="11") -> None:
super().__init__() super().__init__()
self.dl_link = self.dl_links[android_version][0] self.dl_link = self.dl_links[android_version][0]
stuff/houdini.py
+1
View File
@@ -1,6 +1,7 @@
import os import os
import re import re
import shutil import shutil
from stuff.general import General from stuff.general import General
from tools.logger import Logger from tools.logger import Logger
stuff/magisk.py
+11 -8
View File
@@ -1,11 +1,13 @@
import gzip import gzip
import os import os
import shutil
import re import re
import shutil
from stuff.general import General from stuff.general import General
from tools.helper import download_file, get_data_dir, host
from tools.logger import Logger
from tools import container from tools import container
from tools.helper import download_file, get_data_dir
from tools.logger import Logger
class Magisk(General): class Magisk(General):
id = "magisk delta" id = "magisk delta"
@@ -83,8 +85,9 @@ on property:init.svc.zygote=stopped
filename = re.search('lib(.*)\.so', filename) filename = re.search('lib(.*)\.so', filename)
n_path = os.path.join(magisk_absolute_dir, filename.group(1)) n_path = os.path.join(magisk_absolute_dir, filename.group(1))
shutil.copyfile(o_path, n_path) shutil.copyfile(o_path, n_path)
shutil.copyfile(self.download_loc, os.path.join(magisk_absolute_dir,"magisk.apk") ) shutil.copyfile(self.download_loc, os.path.join(magisk_absolute_dir, "magisk.apk"))
shutil.copytree(os.path.join(self.extract_to, "assets", "chromeos"), os.path.join(magisk_absolute_dir, "chromeos"), dirs_exist_ok=True) shutil.copytree(os.path.join(self.extract_to, "assets", "chromeos"),
os.path.join(magisk_absolute_dir, "chromeos"), dirs_exist_ok=True)
assets_files = [ assets_files = [
"addon.d.sh", "addon.d.sh",
"boot_patch.sh", "boot_patch.sh",
@@ -97,11 +100,11 @@ on property:init.svc.zygote=stopped
# Updating Magisk from Magisk manager will modify bootanim.rc, # Updating Magisk from Magisk manager will modify bootanim.rc,
# So it is necessary to backup the original bootanim.rc. # So it is necessary to backup the original bootanim.rc.
bootanim_path = os.path.join(self.copy_dir, self.partition, "etc", "init", "bootanim.rc") bootanim_path = os.path.join(self.copy_dir, self.partition, "etc", "init", "bootanim.rc")
gz_filename = os.path.join(bootanim_path)+".gz" gz_filename = os.path.join(bootanim_path) + ".gz"
with gzip.open(gz_filename,'wb') as f_gz: with gzip.open(gz_filename, 'wb') as f_gz:
f_gz.write(self.oringinal_bootanim.encode('utf-8')) f_gz.write(self.oringinal_bootanim.encode('utf-8'))
with open(bootanim_path, "w") as initfile: with open(bootanim_path, "w") as initfile:
initfile.write(self.oringinal_bootanim+self.bootanim_component) initfile.write(self.oringinal_bootanim + self.bootanim_component)
def set_path_perm(self, path): def set_path_perm(self, path):
if "magisk" in path.split("/"): if "magisk" in path.split("/"):
stuff/microg.py
+6 -4
View File
@@ -1,5 +1,6 @@
import os import os
import shutil import shutil
from stuff.general import General from stuff.general import General
from tools.logger import Logger from tools.logger import Logger
@@ -15,7 +16,7 @@ class MicroG(General):
"org.microg.nlp.backend.ichnaea_20036.apk": "0b3cb65f8458d1a5802737c7392df903", "org.microg.nlp.backend.ichnaea_20036.apk": "0b3cb65f8458d1a5802737c7392df903",
"org.microg.nlp.backend.nominatim_20042.apk": "88e7397cbb9e5c71c8687d3681a23383", "org.microg.nlp.backend.nominatim_20042.apk": "88e7397cbb9e5c71c8687d3681a23383",
} }
microg_apks= { microg_apks = {
"com.google.android.gms-223616054.apk": "a945481ca5d33a03bc0f9418263c3228", "com.google.android.gms-223616054.apk": "a945481ca5d33a03bc0f9418263c3228",
"com.google.android.gsf-8.apk": "b2b4ea3642df6158e14689a4b2a246d4", "com.google.android.gsf-8.apk": "b2b4ea3642df6158e14689a4b2a246d4",
"com.android.vending-22.apk": "6815d191433ffcd8fa65923d5b0b0573", "com.android.vending-22.apk": "6815d191433ffcd8fa65923d5b0b0573",
@@ -107,7 +108,7 @@ service microg_service /system/bin/sh /system/bin/npem
super().__init__() super().__init__()
self.dl_link = self.dl_links[variant][0] self.dl_link = self.dl_links[variant][0]
self.act_md5 = self.dl_links[variant][1] self.act_md5 = self.dl_links[variant][1]
self.id = self.id+f"-{variant}" self.id = self.id + f"-{variant}"
self.dl_file_name = f'MinMicroG-{variant}.zip' self.dl_file_name = f'MinMicroG-{variant}.zip'
if android_version == "11": if android_version == "11":
self.sdk = 30 self.sdk = 30
@@ -123,7 +124,7 @@ service microg_service /system/bin/sh /system/bin/npem
else: else:
sub_arch = "x86" sub_arch = "x86"
if 64 == self.arch[1]: if 64 == self.arch[1]:
arch = f"{sub_arch}{'' if sub_arch=='arm' else '_'}64" arch = f"{sub_arch}{'' if sub_arch == 'arm' else '_'}64"
for root, dirs, files in os.walk(src_dir): for root, dirs, files in os.walk(src_dir):
flag = False flag = False
dir_name = os.path.basename(root) dir_name = os.path.basename(root)
@@ -135,7 +136,8 @@ service microg_service /system/bin/sh /system/bin/npem
sdks.append(i) sdks.append(i)
elif i: elif i:
archs.append(i) archs.append(i)
if len(archs) != 0 and arch not in archs and sub_arch not in archs or len(sdks) != 0 and str(self.sdk) not in sdks: if len(archs) != 0 and arch not in archs and sub_arch not in archs or len(sdks) != 0 and str(
self.sdk) not in sdks:
continue continue
else: else:
flag = True flag = True
stuff/mitm.py
+3 -1
View File
@@ -1,14 +1,16 @@
import os import os
import shutil import shutil
from stuff.general import General from stuff.general import General
from tools.helper import run from tools.helper import run
from tools.logger import Logger from tools.logger import Logger
class Mitm(General): class Mitm(General):
id = "mitm" id = "mitm"
partition = "system" partition = "system"
def __init__(self, ca_cert_file: str=None) -> None: def __init__(self, ca_cert_file: str = None) -> None:
super().__init__() super().__init__()
self.ca_cert_file = ca_cert_file self.ca_cert_file = ca_cert_file
stuff/ndk.py
+2
View File
@@ -1,9 +1,11 @@
import os import os
import re import re
import shutil import shutil
from stuff.general import General from stuff.general import General
from tools.logger import Logger from tools.logger import Logger
class Ndk(General): class Ndk(General):
id = "libndk" id = "libndk"
partition = "system" partition = "system"
stuff/nodataperm.py
+2 -1
View File
@@ -1,10 +1,11 @@
import os import os
import re import re
import shutil import shutil
from stuff.general import General from stuff.general import General
from tools import container
from tools.helper import backup, restore from tools.helper import backup, restore
from tools.logger import Logger from tools.logger import Logger
from tools import container
class Nodataperm(General): class Nodataperm(General):
stuff/smartdock.py
+6 -2
View File
@@ -1,14 +1,16 @@
import os import os
import shutil import shutil
from stuff.general import General from stuff.general import General
class Smartdock(General): class Smartdock(General):
id = "smartdock" id = "smartdock"
dl_link = "https://f-droid.org/repo/cu.axel.smartdock_1100.apk" dl_link = "https://f-droid.org/repo/cu.axel.smartdock_1100.apk"
partition = "system" partition = "system"
dl_file_name = "smartdock.apk" dl_file_name = "smartdock.apk"
act_md5 = "f4087d34218eac902a5cca98ee03d215" act_md5 = "f4087d34218eac902a5cca98ee03d215"
apply_props = { "qemu.hw.mainkeys" : "1" } apply_props = {"qemu.hw.mainkeys": "1"}
skip_extract = True skip_extract = True
permissions = """<?xml version="1.0" encoding="utf-8"?> permissions = """<?xml version="1.0" encoding="utf-8"?>
<permissions> <permissions>
@@ -56,7 +58,9 @@ service set_home_activity /system/bin/sh -c "cmd package set-home-activity cu.ax
shutil.copyfile(os.path.join(self.download_loc), shutil.copyfile(os.path.join(self.download_loc),
os.path.join(self.copy_dir, self.partition, "priv-app/SmartDock/smartdock.apk")) os.path.join(self.copy_dir, self.partition, "priv-app/SmartDock/smartdock.apk"))
with open(os.path.join(self.copy_dir, self.partition, "etc", "permissions", "permissions_cu.axel.smartdock.xml"), "w") as f: with open(
os.path.join(self.copy_dir, self.partition, "etc", "permissions", "permissions_cu.axel.smartdock.xml"),
"w") as f:
f.write(self.permissions) f.write(self.permissions)
rc_dir = os.path.join(self.copy_dir, self.partition, "etc/init/smartdock.rc") rc_dir = os.path.join(self.copy_dir, self.partition, "etc/init/smartdock.rc")
stuff/widevine.py
+3 -1
View File
@@ -1,6 +1,7 @@
import os import os
import re import re
import shutil import shutil
from stuff.general import General from stuff.general import General
from tools.logger import Logger from tools.logger import Logger
@@ -18,7 +19,8 @@ class Widevine(General):
}, },
# "armeabi-v7a": ["https://github.com/supremegamers/vendor_google_proprietary_widevine-prebuilt/archive/a1a19361d36311bee042da8cf4ced798d2c76d98.zip", "fed6898b5cfd2a908cb134df97802554"], # "armeabi-v7a": ["https://github.com/supremegamers/vendor_google_proprietary_widevine-prebuilt/archive/a1a19361d36311bee042da8cf4ced798d2c76d98.zip", "fed6898b5cfd2a908cb134df97802554"],
"arm64-v8a": { "arm64-v8a": {
"11": ["https://github.com/supremegamers/vendor_google_proprietary_widevine-prebuilt/archive/a1a19361d36311bee042da8cf4ced798d2c76d98.zip", "11": [
"https://github.com/supremegamers/vendor_google_proprietary_widevine-prebuilt/archive/a1a19361d36311bee042da8cf4ced798d2c76d98.zip",
"fed6898b5cfd2a908cb134df97802554"] "fed6898b5cfd2a908cb134df97802554"]
} }
} }
tools/container.py
+4 -1
View File
@@ -1,10 +1,12 @@
import configparser import configparser
import os import os
import sys import sys
# import dbus # import dbus
from tools.helper import run from tools.helper import run
from tools.logger import Logger from tools.logger import Logger
# def DBusContainerService(object_path="/ContainerManager", intf="id.waydro.ContainerManager"): # def DBusContainerService(object_path="/ContainerManager", intf="id.waydro.ContainerManager"):
# return dbus.Interface(dbus.SystemBus().get_object("id.waydro.Container", object_path), intf) # return dbus.Interface(dbus.SystemBus().get_object("id.waydro.Container", object_path), intf)
@@ -29,7 +31,7 @@ def use_overlayfs():
Logger.error("Required entry in config was not found, Cannot continue!") Logger.error("Required entry in config was not found, Cannot continue!")
if "mount_overlays" not in cfg["waydroid"]: if "mount_overlays" not in cfg["waydroid"]:
return False return False
if cfg["waydroid"]["mount_overlays"]=="True": if cfg["waydroid"]["mount_overlays"] == "True":
return True return True
return False return False
@@ -49,5 +51,6 @@ def stop():
def is_running(): def is_running():
return "Session:\tRUNNING" in run(["waydroid", "status"]).stdout.decode() return "Session:\tRUNNING" in run(["waydroid", "status"]).stdout.decode()
def upgrade(): def upgrade():
run(["waydroid", "upgrade", "-o"], ignore=r"\[.*\] Stopping container\n\[.*\] Starting container") run(["waydroid", "upgrade", "-o"], ignore=r"\[.*\] Stopping container\n\[.*\] Starting container")
tools/helper.py
+19 -9
View File
@@ -1,16 +1,17 @@
import gzip import gzip
import hashlib
import os import os
import re
import platform import platform
import re import re
import subprocess import subprocess
import sys import sys
import requests
from tools.logger import Logger
from tqdm import tqdm
import hashlib
from typing import Optional from typing import Optional
import requests
from tqdm import tqdm
from tools.logger import Logger
def get_download_dir(): def get_download_dir():
download_loc = "" download_loc = ""
@@ -26,9 +27,12 @@ def get_download_dir():
os.makedirs(download_loc) os.makedirs(download_loc)
return download_loc return download_loc
# not good # not good
def get_data_dir(): def get_data_dir():
return os.path.join('/', "home", os.environ.get("SUDO_USER", os.environ["USER"]), ".local", "share", "waydroid", "data") return os.path.join('/', "home", os.environ.get("SUDO_USER", os.environ["USER"]), ".local", "share", "waydroid",
"data")
# execute on host # execute on host
def run(args: list, env: Optional[str] = None, ignore: Optional[str] = None): def run(args: list, env: Optional[str] = None, ignore: Optional[str] = None):
@@ -52,6 +56,7 @@ def run(args: list, env: Optional[str] = None, ignore: Optional[str] = None):
) )
return result return result
# execute on waydroid shell # execute on waydroid shell
def shell(arg: str, env: Optional[str] = None): def shell(arg: str, env: Optional[str] = None):
a = subprocess.Popen( a = subprocess.Popen(
@@ -61,7 +66,8 @@ def shell(arg: str, env: Optional[str] = None):
stderr=subprocess.PIPE stderr=subprocess.PIPE
) )
subprocess.Popen( subprocess.Popen(
args=["echo", "export BOOTCLASSPATH=/apex/com.android.art/javalib/core-oj.jar:/apex/com.android.art/javalib/core-libart.jar:/apex/com.android.art/javalib/core-icu4j.jar:/apex/com.android.art/javalib/okhttp.jar:/apex/com.android.art/javalib/bouncycastle.jar:/apex/com.android.art/javalib/apache-xml.jar:/system/framework/framework.jar:/system/framework/ext.jar:/system/framework/telephony-common.jar:/system/framework/voip-common.jar:/system/framework/ims-common.jar:/system/framework/framework-atb-backward-compatibility.jar:/apex/com.android.conscrypt/javalib/conscrypt.jar:/apex/com.android.media/javalib/updatable-media.jar:/apex/com.android.mediaprovider/javalib/framework-mediaprovider.jar:/apex/com.android.os.statsd/javalib/framework-statsd.jar:/apex/com.android.permission/javalib/framework-permission.jar:/apex/com.android.sdkext/javalib/framework-sdkextensions.jar:/apex/com.android.wifi/javalib/framework-wifi.jar:/apex/com.android.tethering/javalib/framework-tethering.jar"], args=["echo",
"export BOOTCLASSPATH=/apex/com.android.art/javalib/core-oj.jar:/apex/com.android.art/javalib/core-libart.jar:/apex/com.android.art/javalib/core-icu4j.jar:/apex/com.android.art/javalib/okhttp.jar:/apex/com.android.art/javalib/bouncycastle.jar:/apex/com.android.art/javalib/apache-xml.jar:/system/framework/framework.jar:/system/framework/ext.jar:/system/framework/telephony-common.jar:/system/framework/voip-common.jar:/system/framework/ims-common.jar:/system/framework/framework-atb-backward-compatibility.jar:/apex/com.android.conscrypt/javalib/conscrypt.jar:/apex/com.android.media/javalib/updatable-media.jar:/apex/com.android.mediaprovider/javalib/framework-mediaprovider.jar:/apex/com.android.os.statsd/javalib/framework-statsd.jar:/apex/com.android.permission/javalib/framework-permission.jar:/apex/com.android.sdkext/javalib/framework-sdkextensions.jar:/apex/com.android.wifi/javalib/framework-wifi.jar:/apex/com.android.tethering/javalib/framework-tethering.jar"],
stdout=a.stdin, stdout=a.stdin,
stdin=subprocess.PIPE stdin=subprocess.PIPE
).communicate() ).communicate()
@@ -89,6 +95,7 @@ def shell(arg: str, env: Optional[str] = None):
) )
return a.stdout.read().decode("utf-8") return a.stdout.read().decode("utf-8")
def download_file(url, f_name): def download_file(url, f_name):
md5 = "" md5 = ""
response = requests.get(url, stream=True) response = requests.get(url, stream=True)
@@ -107,6 +114,7 @@ def download_file(url, f_name):
raise ValueError("Something went wrong while downloading") raise ValueError("Something went wrong while downloading")
return md5 return md5
def host(): def host():
machine = platform.machine() machine = platform.machine()
@@ -133,14 +141,16 @@ def check_root():
Logger.error("This script must be run as root. Aborting.") Logger.error("This script must be run as root. Aborting.")
sys.exit(1) sys.exit(1)
def backup(path): def backup(path):
gz_filename = path+".gz" gz_filename = path + ".gz"
with gzip.open(gz_filename, 'wb') as f_gz: with gzip.open(gz_filename, 'wb') as f_gz:
with open(path, "rb") as f: with open(path, "rb") as f:
f_gz.write(f.read()) f_gz.write(f.read())
def restore(path): def restore(path):
gz_filename = path+".gz" gz_filename = path + ".gz"
with gzip.GzipFile(gz_filename) as f_gz: with gzip.GzipFile(gz_filename) as f_gz:
with open(path, "wb") as f: with open(path, "wb") as f:
f.writelines(f_gz) f.writelines(f_gz)
tools/images.py
+6 -2
View File
@@ -1,16 +1,18 @@
import configparser import configparser
import os import os
import subprocess
import sys import sys
from tools.helper import run from tools.helper import run
from tools.logger import Logger from tools.logger import Logger
def mount(image, mount_point): def mount(image, mount_point):
umount(mount_point, False) umount(mount_point, False)
if not os.path.exists(mount_point): if not os.path.exists(mount_point):
os.makedirs(mount_point) os.makedirs(mount_point)
run(["mount", "-o", "rw", image, mount_point]) run(["mount", "-o", "rw", image, mount_point])
def umount(mount_point, exists=True): def umount(mount_point, exists=True):
if not os.path.exists(mount_point): if not os.path.exists(mount_point):
if not exists: if not exists:
@@ -23,10 +25,12 @@ def umount(mount_point, exists=True):
Logger.warning("{} is not a mount point".format( Logger.warning("{} is not a mount point".format(
mount_point)) mount_point))
def resize(img_file, size): def resize(img_file, size):
run(["sudo", "e2fsck", "-y", "-f", img_file], ignore="^e2fsck \d+\.\d+\.\d (.+)\n$") run(["sudo", "e2fsck", "-y", "-f", img_file], ignore="^e2fsck \d+\.\d+\.\d (.+)\n$")
run(["sudo", "resize2fs", img_file, size], ignore="^resize2fs \d+\.\d+\.\d (.+)\n$") run(["sudo", "resize2fs", img_file, size], ignore="^resize2fs \d+\.\d+\.\d (.+)\n$")
def get_image_dir(): def get_image_dir():
# Read waydroid config to get image location # Read waydroid config to get image location
cfg = configparser.ConfigParser() cfg = configparser.ConfigParser()
@@ -36,6 +40,6 @@ def get_image_dir():
sys.exit(1) sys.exit(1)
cfg.read(cfg_file) cfg.read(cfg_file)
if "waydroid" not in cfg: if "waydroid" not in cfg:
Logger.error("Required entry in config was not found, Cannot continue!") #magisk Logger.error("Required entry in config was not found, Cannot continue!") # magisk
sys.exit(1) sys.exit(1)
return cfg["waydroid"]["images_path"] return cfg["waydroid"]["images_path"]
tools/logger.py
+3 -3
View File
@@ -2,12 +2,12 @@ class Logger:
@staticmethod @staticmethod
def error(str): def error(str):
print("\033[31m"+"ERROR: "+str+"\033[0m") print("\033[31m" + "ERROR: " + str + "\033[0m")
@staticmethod @staticmethod
def info(str): def info(str):
print("\033[32m"+"INFO: "+"\033[0m"+str) print("\033[32m" + "INFO: " + "\033[0m" + str)
@staticmethod @staticmethod
def warning(str): def warning(str):
print("\033[33m"+"WARN: "+str+"\033[0m") print("\033[33m" + "WARN: " + str + "\033[0m")