Update README.md with workaround for ERROR: Cannot access gservices.db

with workaround mentined here: https://github.com/casualsnek/waydroid_script/issues/72

.gitignore

@@ -0,0 +1,106 @@
+git
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+*.out
+# Distribution / packaging
+.Python
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+*.egg-info/
+.installed.cfg
+*.egg
+MANIFEST
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*.cover
+.hypothesis/
+.pytest_cache/
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+local_settings.py
+db.sqlite3
+
+# Flask stuff:
+instance/
+.webassets-cache
+
+# Scrapy stuff:
+.scrapy
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+target/
+
+# Jupyter Notebook
+.ipynb_checkpoints
+
+# pyenv
+.python-version
+.idea/
+# celery beat schedule file
+celerybeat-schedule
+workspace.xml
+# SageMath parsed files
+*.sage.py
+.idea/workspace.xml
+# Environments
+.env
+.venv
+env/
+venv/
+ENV/
+env.bak/
+venv.bak/
+
+# Spyder project settings
+.spyderproject
+.spyproject
+
+# Rope project settings
+.ropeproject
+
+# mkdocs documentation
+/site
+
+# mypy
+.mypy_cache/
+

README.md

@@ -19,60 +19,90 @@ Then run:
     git clone https://github.com/casualsnek/waydroid_script
     cd waydroid_script
     sudo python3 -m pip install -r requirements.txt
-    sudo python3 waydroid_extras.py [-i/-g/-n/-h]
+    sudo python3 main.py [-i/-g/-n/-h/-w]
 
 ## Install OpenGapps
 
-Open terminal and switch to directory where "waydroid_extras.py" is located then run:
+Open terminal and switch to directory where "main.py" is located then run:
 
-    sudo python3 waydroid_extras.py -g
-Then restart waydroid service with command below :
+    sudo python3 main.py -g
 
-    sudo systemctl start waydroid-container.service
 Then launch waydroid with:
 
     waydroid show-full-ui
-After waydroid has finished booting open terminal and switch to directory where "waydroid_extras.py" is located then run:
+After waydroid has finished booting open terminal and switch to directory where "main.py" is located then run:
 
-    sudo python3 waydroid_extras.py -i
+    sudo python3 main.py -i
 Copy the returned numeric ID open ["https://google.com/android/uncertified/?pli=1"](https://google.com/android/uncertified/?pli=1) enter the id and register it, you may need to wait upto 10-20 minutes for device to get registered, then clear Google Play Service's cache and try logging in !
 
+<details>
+  <summary>If you get the error: `ERROR: Cannot access gservices.db, make sure gapps is installed and waydroid was started at least once after installation and make sure waydroid is running !`</summary>
+
+  1. run `sudo waydroid shell`
+  2. inside the waydroid shell run ```ANDROID_RUNTIME_ROOT=/apex/com.android.runtime ANDROID_DATA=/data ANDROID_TZDATA_ROOT=/apex/com.android.tzdata ANDROID_I18N_ROOT=/apex/com.android.i18n sqlite3 /data/data/com.google.android.gsf/databases/gservices.db "select * from main where name = \"android_id\";"``` to get the numeric ID as explained here: https://github.com/casualsnek/waydroid_script/issues/72
+</details>
+
 ## Install Magisk
 
-Open terminal and switch to directory where "waydroid_extras.py" is located then run:
+Open terminal and switch to directory where "main.py" is located then run:
 
-    sudo python3 waydroid_extras.py -m
-Then restart waydroid service with command below :
+    sudo python3 main.py -m
 
-    sudo systemctl start waydroid-container.service
 Magisk will be installed on next boot ! 
-Note That this is bootless installation and modules don't work as of now !
+
+Zygisk and modules like LSPosed should work now.
+
+Please use `Direct Install into system partition` to update Magisk in Magisk manager.
 
 ## Install libndk arm translation 
 
-This may or may not work properly and is only for testing:
-Open terminal and switch to directory where "waydroid_extras.py" is located then run:
+libndk_translation from guybrush firmware. 
 
-    sudo python3 waydroid_extras.py -n
-Then restart waydroid service with command below :
+libndk seems to have better performance than libhoudini on AMD.
 
-    sudo systemctl start waydroid-container.service
+Open terminal and switch to directory where "main.py" is located then run:
+
+    sudo python3 main.py -n
 
 ## Install libhoudini arm translation
 
-This may or may not work properly and is only for testing: ( Much stable than libndk ) and works on android 11 images
-Open terminal and switch to directory where "waydroid_extras.py" is located then run:
+Intel's libhoudini for intel/AMD x86 CPU, pulled from Microsoft's WSA 11 image
+
+houdini version: 11.0.1b_y.38765.m
+
+houdini64 version: 11.0.1b_z.38765.m
+
+Open terminal and switch to directory where "main.py" is located then run:
+
+    sudo python3 main.py -l
+
+## Integrate Widevine DRM (L3)
+
+Open terminal and switch to directory where "main.py" is located then run:
+    
+    sudo python3 main.py -w
     
-    sudo python3 waydroid_extras.py -l
-Then restart waydroid service with command below :
 
-    sudo systemctl start waydroid-container.service
 
 ## 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:
-Open terminal and switch to directory where "waydroid_extras.py" is located then run:
+Open terminal and switch to directory where "main.py" is located then run:
 
-    sudo python3 waydroid_extras.py -i
+    sudo python3 main.py -i
 
 Star this repository if you find this useful, if you encounter problem create a issue on github !
+
+## Error handling  
+
+In case of error, if you retry immediately and it fails with this error 
+```
+==> Failed to resize image '/var/lib/waydroid/images/system.img' .. !  e2fsck 1.45.5 (07-Jan-2020)
+/var/lib/waydroid/images/system.img is mounted.
+e2fsck: Cannot continue, aborting.
+```
+You need to get the mounting point using `df | grep waydroid`. It will be something like `/dev/loopXXX`. Then, unmount it
+```
+sudo umount /dev/loopXXX
+```
+And re-run the script.

main.py

@@ -0,0 +1,63 @@
+import argparse
+from logging import Logger
+from stuffs.android_id import Android_id
+from stuffs.gapps import Gapps
+from stuffs.houdini import Houdini
+from stuffs.magisk import Magisk
+from stuffs.ndk import Ndk
+from stuffs.widevine import Widevine
+import tools.helper as helper
+
+
+def main():
+    about = """
+    WayDroid Helper script v0.3
+    Does stuff like installing Gapps, Installing NDK Translation and getting Android ID for device registration.
+    Use -h  flag for help !
+    """
+    helper.check_root()
+    parser = argparse.ArgumentParser(description=about, formatter_class=argparse.RawDescriptionHelpFormatter)
+    parser.add_argument('-g', '--install-gapps',
+                        dest='gapps',
+                        help='Install OpenGapps to waydroid',
+                        action='store_true')
+    parser.add_argument('-n', '--install-ndk-translation',
+                        dest='ndk',
+                        help='Install libndk translation for arm translation',
+                        action='store_true')
+    parser.add_argument('-i', '--get-android-id', dest='getid',
+                        help='Displays your android id for manual registration',
+                        action='store_true')
+    parser.add_argument('-m', '--install-magisk', dest='magisk',
+                        help='Attempts to install Magisk ( Bootless )',
+                        action='store_true')
+    parser.add_argument('-l', '--install-libhoudini', dest='houdini',
+                        help='Install libhoudini for arm translation',
+                        action='store_true')
+    parser.add_argument('-w', '--install-windevine', dest='widevine',
+                        help='Integrate Widevine DRM (L3)',
+                        action='store_true')
+    args = parser.parse_args()
+    if args.getid:
+       Android_id().get_id() 
+    if args.gapps:
+        Gapps().install()
+    if args.ndk and not args.houdini:
+        arch = helper.host()[0]
+        if arch == "x86_64":
+            Ndk().install()
+        else:
+            Logger.warn("libndk is not supported on your CPU")
+    if args.houdini and not args.ndk:
+        arch = helper.host()[0]
+        if arch == "x86_64":
+            Houdini().install()
+        else:
+            Logger.warn("libhoudini is not supported on your CPU")
+    if args.magisk:
+        Magisk().install()
+    if args.widevine:
+        Widevine().install()
+
+if __name__ == "__main__":
+    main()

stuffs/android_id.py

@@ -0,0 +1,18 @@
+import os
+import sys
+from tools.helper import run
+from tools.logger import Logger
+
+
+class Android_id:
+   def get_id(self):
+        if not os.path.isfile("/var/lib/waydroid/data/data/com.google.android.gsf/databases/gservices.db"):
+            Logger.error("Cannot access gservices.db, make sure gapps is installed and waydroid was started at least once after installation and make sure waydroid is running !")
+            sys.exit(1)
+        sqs = """
+                SELECT * FROM main WHERE name='android_id'
+            """
+        queryout = run(["sqlite3", "/var/lib/waydroid/data/data/com.google.android.gsf/databases/gservices.db", sqs.strip()])
+        print(queryout.stdout.decode().replace("android_id|", "").strip())
+        print("   ^----- Open https://google.com/android/uncertified/?pli=1")
+        print("          Login with your google id then submit the form with id shown above")

stuffs/gapps.py

@@ -0,0 +1,59 @@
+import os
+import shutil
+from stuffs.general import General
+from tools.helper import host, run
+from tools.logger import Logger
+
+class Gapps(General):
+    partition = "system"
+    dl_links = {
+            "x86_64": ["https://master.dl.sourceforge.net/project/opengapps/x86_64/20220121/open_gapps-x86_64-10.0-pico-20220121.zip?viasf=1", "e8c9a7412f5712eea7948957a62a7d66"],
+            "x86": ["https://udomain.dl.sourceforge.net/project/opengapps/x86/20220122/open_gapps-x86-10.0-pico-20220122.zip", "9e39e45584b7ade4529e6be654af7b81"],
+            "arm64-v8a": ["https://liquidtelecom.dl.sourceforge.net/project/opengapps/arm64/20220122/open_gapps-arm64-10.0-pico-20220122.zip", "8dfa6e76aeb2d1d5aed40b058e8a852c"],
+            "armeabi-v7a": ["https://nav.dl.sourceforge.net/project/opengapps/arm/20220122/open_gapps-arm-10.0-pico-20220122.zip", "a48ccbd25eb0a3c5e30f5db5435f5536"]
+        }
+    arch = host()
+    dl_link = dl_links[arch[0]][0]
+    dl_file_name = "open_gapps.zip"
+    act_md5 = dl_links[arch[0]][1]
+    extract_to = "/tmp/ogapps/extract"
+    non_apks = [
+        "defaultetc-common.tar.lz",
+        "defaultframework-common.tar.lz",
+        "googlepixelconfig-common.tar.lz"
+        ]
+    skip = [
+        "setupwizarddefault-x86_64.tar.lz",
+        "setupwizardtablet-x86_64.tar.lz"
+        ]
+
+    def download(self):
+        Logger.info("Downloading OpenGapps now to {} .....".format(self.download_loc))
+        super().download()
+
+    def copy(self):
+        if not os.path.exists(self.extract_to):
+            os.makedirs(self.extract_to)
+        if not os.path.exists(os.path.join(self.extract_to, "appunpack")):
+            os.makedirs(os.path.join(self.extract_to, "appunpack"))
+
+        for lz_file in os.listdir(os.path.join(self.extract_to, "Core")):
+            for d in os.listdir(os.path.join(self.extract_to, "appunpack")):
+                shutil.rmtree(os.path.join(self.extract_to, "appunpack", d))
+            if lz_file not in self.skip:
+                if lz_file not in self.non_apks:
+                    print("    Processing app package : "+os.path.join(self.extract_to, "Core", lz_file))
+                    run(["tar", "--lzip", "-xvf", os.path.join(self.extract_to, "Core", lz_file), "-C", os.path.join(self.extract_to, "appunpack")])
+                    app_name = os.listdir(os.path.join(self.extract_to, "appunpack"))[0]
+                    xx_dpi = os.listdir(os.path.join(self.extract_to, "appunpack", app_name))[0]
+                    app_priv = os.listdir(os.path.join(self.extract_to, "appunpack", app_name, "nodpi"))[0]
+                    app_src_dir = os.path.join(self.extract_to, "appunpack", app_name, xx_dpi, app_priv)
+                    for app in os.listdir(app_src_dir):
+                        shutil.copytree(os.path.join(app_src_dir, app), os.path.join(self.copy_dir, self.partition, "priv-app", app), dirs_exist_ok=True)
+                else:
+                    print("    Processing extra package : "+os.path.join(self.extract_to, "Core", lz_file))
+                    run(["tar", "--lzip", "-xvf", os.path.join(self.extract_to, "Core", lz_file), "-C", os.path.join(self.extract_to, "appunpack")])
+                    app_name = os.listdir(os.path.join(self.extract_to, "appunpack"))[0]
+                    common_content_dirs = os.listdir(os.path.join(self.extract_to, "appunpack", app_name, "common"))
+                    for ccdir in common_content_dirs:
+                        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)

stuffs/general.py

@@ -0,0 +1,133 @@
+import configparser
+import os
+import re
+import zipfile
+import hashlib
+from tools import images
+from tools.helper import download_file, get_download_dir, run
+from tools.container import DBusContainerService
+from tools.logger import Logger
+
+class General:
+    @property
+    def download_loc(self):
+        return os.path.join(get_download_dir(), self.dl_file_name)
+
+    @property
+    def copy_dir(self):
+        if self.use_overlayfs:
+            return "/var/lib/waydroid/overlay"
+        else:
+            return "/tmp/waydroid"
+
+    @property
+    def use_dbus(self):
+        try:
+            DBusContainerService()
+        except:
+            return False
+        return True
+
+    @property
+    def use_overlayfs(self):
+        with open("/var/lib/waydroid/waydroid.cfg") as f:
+            cont=f.read()
+            if re.search("mount_overlays[ \t]*=[ \t]*True", cont):
+                return True
+            return False
+
+    def download(self):
+        loc_md5 = ""
+        if os.path.isfile(self.download_loc):
+            with open(self.download_loc, "rb") as f:
+                bytes = f.read()
+                loc_md5 = hashlib.md5(bytes).hexdigest()
+        while not os.path.isfile(self.download_loc) or loc_md5 != self.act_md5:
+            if os.path.isfile(self.download_loc):
+                os.remove(self.download_loc)
+                Logger.warning(
+                    "md5 mismatches, redownloading now ....")
+            loc_md5 = download_file(self.dl_link, self.download_loc)
+
+    def extract(self):
+        Logger.info("Extracting archive...")
+        with zipfile.ZipFile(self.download_loc) as z:
+            z.extractall(self.extract_to)
+
+    def add_props(self):
+        cfg = configparser.ConfigParser()
+        cfg.read("/var/lib/waydroid/waydroid.cfg")
+
+        for key in self.apply_props.keys():
+            cfg.set('properties', key, self.apply_props[key])
+        
+        with open("/var/lib/waydroid/waydroid.cfg", "w") as f:
+            cfg.write(f)
+
+    def mount(self):
+        img = os.path.join(images.get_image_dir(), self.partition+".img")
+        mount_point = ""
+        if self.partition == "system":
+            mount_point = os.path.join(self.copy_dir)
+        else:
+            mount_point = os.path.join(self.copy_dir, self.partition)
+        Logger.info("Mounting {} to {}".format(img, mount_point))
+        images.mount(img, mount_point)
+
+    def resize(self):
+        img = os.path.join(images.get_image_dir(), self.partition+".img")
+        img_size = int(os.path.getsize(img)/(1024*1024))
+        new_size = "{}M".format(img_size+500)
+        Logger.info("Resizing {} to {}".format(img, new_size))
+        images.resize(img, new_size)
+
+    def umount(self):
+        mount_point = ""
+        if self.partition == "system":
+            mount_point = os.path.join(self.copy_dir)
+        else:
+            mount_point = os.path.join(self.copy_dir, self.partition)
+        Logger.info("Umounting {}".format(mount_point))
+        images.umount(mount_point)
+
+    def stop(self):
+        if self.use_dbus:
+            self.session = DBusContainerService().GetSession()
+            if self.session:
+                DBusContainerService().Stop(False)
+        else:
+            run(["waydroid", "container", "stop"])
+
+    def start(self):
+        if self.use_dbus and self.session:
+            DBusContainerService().Start(self.session)
+        else:
+            run(["systemctl", "restart", "waydroid-container.service"])
+
+    def restart(self):
+        self.stop()
+        self.start()
+
+    def copy(self):
+        pass
+
+    def install(self):
+        if self.use_overlayfs:
+            self.download()
+            self.extract()
+            self.copy()
+            if hasattr(self, "apply_props"):
+                self.add_props()
+            self.restart()
+        else:
+            self.stop()
+            self.download()
+            self.extract()
+            self.resize()
+            self.mount()
+            self.copy()
+            if hasattr(self, "apply_props"):
+                self.add_props()
+            self.umount()
+            self.start()
+        Logger.info("Installation finished")

stuffs/houdini.py

@@ -0,0 +1,49 @@
+import os
+import re
+import shutil
+from stuffs.general import General
+from tools.helper import run
+from tools.logger import Logger
+
+
+class Houdini(General):
+    partition = "system"
+    dl_link =  "https://github.com/supremegamers/vendor_intel_proprietary_houdini/archive/81f2a51ef539a35aead396ab7fce2adf89f46e88.zip"
+    act_md5 = "fbff756612b4144797fbc99eadcb6653"
+    dl_file_name = "libhoudini.zip"
+    extract_to = "/tmp/houdiniunpack"
+    init_rc_component = """
+on early-init
+    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"
+    exec -- /system/bin/sh -c "echo ':arm_dyn:M::\\\\x7f\\\\x45\\\\x4c\\\\x46\\\\x01\\\\x01\\\\x01\\\\x00\\\\x00\\\\x00\\\\x00\\\\x00\\\\x00\\\\x00\\\\x00\\\\x00\\\\x03\\\\x00\\\\x28::/system/bin/houdini:P' >> /proc/sys/fs/binfmt_misc/register"
+    exec -- /system/bin/sh -c "echo ':arm64_exe:M::\\\\x7f\\\\x45\\\\x4c\\\\x46\\\\x02\\\\x01\\\\x01\\\\x00\\\\x00\\\\x00\\\\x00\\\\x00\\\\x00\\\\x00\\\\x00\\\\x00\\\\x02\\\\x00\\\\xb7::/system/bin/houdini64:P' >> /proc/sys/fs/binfmt_misc/register"
+    exec -- /system/bin/sh -c "echo ':arm64_dyn:M::\\\\x7f\\\\x45\\\\x4c\\\\x46\\\\x02\\\\x01\\\\x01\\\\x00\\\\x00\\\\x00\\\\x00\\\\x00\\\\x00\\\\x00\\\\x00\\\\x00\\\\x03\\\\x00\\\\xb7::/system/bin/houdini64:P' >> /proc/sys/fs/binfmt_misc/register"
+"""
+    apply_props = {
+        "ro.product.cpu.abilist": "x86_64,x86,arm64-v8a,armeabi-v7a,armeabi",
+        "ro.product.cpu.abilist32": "x86,armeabi-v7a,armeabi",
+        "ro.product.cpu.abilist64": "x86_64,arm64-v8a",
+        "ro.dalvik.vm.native.bridge": "libhoudini.so",
+        "ro.enable.native.bridge.exec": "1",
+        "ro.dalvik.vm.isa.arm": "x86",
+        "ro.dalvik.vm.isa.arm64": "x86_64"
+    }
+
+    def download(self):
+        Logger.info("Downloading libhoudini to {}now .....".format(self.download_loc))
+        super().download()
+
+    def copy(self):
+        run(["chmod", "+x", self.extract_to, "-R"])
+        Logger.info("Copying libhoudini library files ...")
+        name = re.findall("([a-zA-Z0-9]+)\.zip", self.dl_link)[0]
+        shutil.copytree(os.path.join(self.extract_to, "vendor_intel_proprietary_houdini-" + name,
+                        "prebuilts"), os.path.join(self.copy_dir, self.partition), dirs_exist_ok=True)
+        init_path = os.path.join(self.copy_dir, self.partition, "etc", "init", "houdini.rc")
+        if not os.path.isfile(init_path):
+            os.makedirs(os.path.dirname(init_path), exist_ok=True)
+        with open(init_path, "w") as initfile:
+            initfile.write(self.init_rc_component)        

stuffs/magisk.py

@@ -0,0 +1,89 @@
+import gzip
+import os
+import shutil
+import re
+from stuffs.general import General
+from tools.helper import download_file, host, run
+from tools.logger import Logger
+
+class Magisk(General):
+    partition = "system"
+    dl_link = "https://huskydg.github.io/magisk-files/app-release.apk"
+    dl_file_name = "magisk.apk"
+    extract_to = "/tmp/magisk_unpack"
+    magisk_dir = os.path.join(partition, "etc", "init", "magisk")
+    machine = host()
+    oringinal_bootanim = """
+service bootanim /system/bin/bootanimation
+    class core animation
+    user graphics
+    group graphics audio
+    disabled
+    oneshot
+    ioprio rt 0
+    task_profiles MaxPerformance
+    
+"""
+    bootanim_component = """
+on post-fs-data
+    start logd
+    exec u:r:su:s0 root root -- /system/etc/init/magisk/magisk{arch} --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 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 -- /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 -- /sbin/magisk --auto-selinux --zygote-restart
+   
+on property:init.svc.zygote=stopped
+    exec u:r:su:s0 root root -- /sbin/magisk --auto-selinux --zygote-restart
+    """.format(arch=machine[1])
+
+    def download(self):
+        if os.path.isfile(self.download_loc):
+            os.remove(self.download_loc)
+        Logger.info("Downloading latest Magisk-Delta to {} now ...".format(self.download_loc))
+        download_file(self.dl_link, self.download_loc)    
+
+    def copy(self):
+        magisk_absolute_dir = os.path.join(self.copy_dir, self.magisk_dir)
+        if not os.path.exists(magisk_absolute_dir):
+            os.makedirs(magisk_absolute_dir, exist_ok=True)
+
+        if not os.path.exists(os.path.join(self.copy_dir, "sbin")):
+            os.makedirs(os.path.join(self.copy_dir, "sbin"), exist_ok=True)
+
+        Logger.info("Copying magisk libs now ...")
+        
+        lib_dir = os.path.join(self.extract_to, "lib", self.machine[0])
+        for parent, dirnames, filenames in os.walk(lib_dir):
+            for filename in filenames:
+                o_path = os.path.join(lib_dir, filename)  
+                filename = re.search('lib(.*)\.so', filename)
+                n_path = os.path.join(magisk_absolute_dir, filename.group(1))
+                shutil.copyfile(o_path, n_path)
+                run(["chmod", "+x", n_path])
+        shutil.copyfile(self.download_loc, os.path.join(magisk_absolute_dir,"magisk.apk") )
+
+        # Updating Magisk from Magisk manager will modify 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")
+        gz_filename = os.path.join(bootanim_path)+".gz"
+        with gzip.open(gz_filename,'wb') as f_gz:
+            f_gz.write(self.oringinal_bootanim.encode('utf-8'))
+        with open(bootanim_path, "w") as initfile:
+            initfile.write(self.oringinal_bootanim+self.bootanim_component)

stuffs/ndk.py

@@ -0,0 +1,57 @@
+from os import path, makedirs
+import shutil
+from stuffs.general import General
+from tools.helper import run
+from tools.logger import Logger
+
+class Ndk(General):
+    partition = "system"
+    dl_link = "https://github.com/supremegamers/vendor_google_proprietary_ndk_translation-prebuilt/archive/181d9290a69309511185c4417ba3d890b3caaaa8.zip"
+    dl_file_name = "libndktranslation.zip"
+    extract_to = "/tmp/libndkunpack"
+    act_md5 = "0beff55f312492f24d539569d84f5bfb"
+    apply_props = {
+        "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",
+        "ro.enable.native.bridge.exec": "1",
+      #  "ro.ndk_translation.version": "0.2.2",
+        "ro.dalvik.vm.isa.arm": "x86",
+        "ro.dalvik.vm.isa.arm64": "x86_64"
+    }
+    init_rc_component = """
+# Enable native bridge for target executables
+on early-init
+    mount binfmt_misc binfmt_misc /proc/sys/fs/binfmt_misc
+
+on property:ro.enable.native.bridge.exec=1
+    copy /system/etc/binfmt_misc/arm_exe /proc/sys/fs/binfmt_misc/register
+    copy /system/etc/binfmt_misc/arm_dyn /proc/sys/fs/binfmt_misc/register
+    copy /system/etc/binfmt_misc/arm64_exe /proc/sys/fs/binfmt_misc/register
+    copy /system/etc/binfmt_misc/arm64_dyn /proc/sys/fs/binfmt_misc/register
+"""
+    
+    def download(self):
+        Logger.info("Downloading libndk to {} now .....".format(self.download_loc))
+        super().download()
+
+    def copy(self):
+        run(["chmod", "+x", self.extract_to, "-R"])
+        Logger.info("Copying libndk library files ...")
+        archive_url, commit_sha = path.split(path.splitext(self.dl_link)[0])
+        zipped_basepath, _ = path.split(archive_url)
+        prebuilts_sourcedir = path.join(
+            self.extract_to,
+            f"{path.basename(zipped_basepath)}-{commit_sha}",
+            "prebuilts")
+        shutil.copytree(
+            prebuilts_sourcedir,
+            path.join(self.copy_dir, self.partition),
+            dirs_exist_ok=True)
+
+        init_path = path.join(self.copy_dir, self.partition, "etc", "init", "libndk.rc")
+        if not path.isfile(init_path):
+            makedirs(path.dirname(init_path), exist_ok=True)
+        with open(init_path, "w") as initfile:
+            initfile.write(self.init_rc_component)

stuffs/widevine.py

@@ -0,0 +1,23 @@
+import os
+import shutil
+from stuffs.general import General
+from tools.helper import run
+from tools.logger import Logger
+
+
+class Widevine(General):
+    partition = "vendor"
+    dl_link = "https://codeload.github.com/supremegamers/vendor_google_proprietary_widevine-prebuilt/zip/94c9ee172e3d78fecc81863f50a59e3646f7a2bd"
+    dl_file_name = "widevine.zip"
+    extract_to = "/tmp/widevineunpack"
+    act_md5 = "a31f325453c5d239c21ecab8cfdbd878"
+
+    def download(self):
+        Logger.info("Downloading widevine to {} now .....".format(self.download_loc))
+        super().download()
+
+    def copy(self):
+        run(["chmod", "+x", self.extract_to, "-R"])
+        Logger.info("Copying widevine library files ...")
+        shutil.copytree(os.path.join(self.extract_to, "vendor_google_proprietary_widevine-prebuilt-94c9ee172e3d78fecc81863f50a59e3646f7a2bd",
+                        "prebuilts"), os.path.join(self.copy_dir, self.partition), dirs_exist_ok=True)

tools/container.py

@@ -0,0 +1,7 @@
+import dbus
+
+def DBusContainerService(object_path="/ContainerManager", intf="id.waydro.ContainerManager"):
+    return dbus.Interface(dbus.SystemBus().get_object("id.waydro.Container", object_path), intf)
+
+def DBusSessionService(object_path="/SessionManager", intf="id.waydro.SessionManager"):
+    return dbus.Interface(dbus.SessionBus().get_object("id.waydro.Session", object_path), intf)

tools/helper.py

@@ -0,0 +1,74 @@
+import os
+import platform
+import subprocess
+import sys
+import requests
+from tools.logger import Logger
+from tqdm import tqdm
+import hashlib
+
+def get_download_dir():
+    download_loc = ""
+    if os.environ.get("XDG_CACHE_HOME", None) is None:
+        download_loc = os.path.join('/', "home", os.environ.get("SUDO_USER", os.environ["USER"]), ".cache", "waydroid-script", "downloads")
+    else:
+        download_loc = os.path.join(os.environ["XDG_CACHE_HOME"], "waydroid-script", "downloads")
+    if not os.path.exists(download_loc):
+        os.makedirs(download_loc)
+    return download_loc
+
+def run(args):
+    result = subprocess.run(args=args, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+    # print(result.stdout.decode())
+    if result.stderr:
+        Logger.error(result.stderr.decode("utf-8"))
+        raise subprocess.CalledProcessError(
+                    returncode = result.returncode,
+                    cmd = result.args,
+                    stderr = result.stderr
+                )
+    return result
+
+def download_file(url, f_name):
+    md5 = ""
+    response = requests.get(url, stream=True)
+    total_size_in_bytes = int(response.headers.get('content-length', 0))
+    block_size = 1024  # 1 Kibibyte
+    progress_bar = tqdm(total=total_size_in_bytes, unit='iB', unit_scale=True)
+    with open(f_name, 'wb') as file:
+        for data in response.iter_content(block_size):
+            progress_bar.update(len(data))
+            file.write(data)
+    progress_bar.close()
+    with open(f_name, "rb") as f:
+        bytes = f.read()
+        md5 = hashlib.md5(bytes).hexdigest()
+    if total_size_in_bytes != 0 and progress_bar.n != total_size_in_bytes:
+        raise ValueError("Something went wrong while downloading")
+    return md5
+
+def host():
+    machine = platform.machine()
+
+    mapping = {
+        "i686": ("x86", 32),
+        "x86_64": ("x86_64", 64),
+        "aarch64": ("arm64-v8a", 64),
+        "armv7l": ("armeabi-v7a", 32),
+        "armv8l": ("armeabi-v7a", 32)
+    }
+    if machine in mapping:
+        if mapping[machine] == "x86_64":
+            with open("/proc/cpuinfo") as f:
+                if "sse4_2" not in f.read():
+                    Logger.warning("x86_64 CPU does not support SSE4.2, falling back to x86...")
+                    return ("x86", 32)
+        return mapping[machine]
+    raise ValueError("platform.machine '" + machine + "'"
+                     " architecture is not supported")
+
+
+def check_root():
+    if os.geteuid() != 0:
+        Logger.error("This script must be run as root. Aborting.")
+        sys.exit(1)

tools/images.py

@@ -0,0 +1,47 @@
+import configparser
+import os
+import subprocess
+import sys
+from tools.helper import run
+from tools.logger import Logger
+
+def mount(image, mount_point):
+    umount(mount_point, False)
+    if not os.path.exists(mount_point):
+        os.makedirs(mount_point)
+    run(["mount", "-o", "rw", image, mount_point])
+
+def umount(mount_point, exists=True):
+    if not os.path.exists(mount_point):
+        if not exists:
+            return
+        Logger.error("{} does not exist!".format(mount_point))
+        raise FileNotFoundError()
+    if not run(["mountpoint", mount_point]).returncode:
+        run(["umount", mount_point])
+    else:
+        Logger.warning("{} is not a mount point".format(
+            mount_point))
+
+def resize(img_file, size):
+    try:
+        run(["e2fsck", "-y", "-f", img_file])
+    except subprocess.CalledProcessError:
+        pass
+    try:
+        run(["resize2fs", img_file, size])
+    except subprocess.CalledProcessError:
+        pass
+
+def get_image_dir():
+    # Read waydroid config to get image location
+    cfg = configparser.ConfigParser()
+    cfg_file = os.environ.get("WAYDROID_CONFIG", "/var/lib/waydroid/waydroid.cfg")
+    if not os.path.isfile(cfg_file):
+        Logger.error("Cannot locate waydroid config file, reinit wayland and try again!")
+        sys.exit(1)
+    cfg.read(cfg_file)
+    if "waydroid" not in cfg:
+        Logger.error("ERROR: Required entry in config was not found, Cannot continue!") #magisk
+        sys.exit(1)
+    return cfg["waydroid"]["images_path"]

tools/logger.py

@@ -0,0 +1,13 @@
+class Logger:
+
+    @staticmethod
+    def error(str):
+        print("\033[31m"+"ERROR: "+str+"\033[0m")
+
+    @staticmethod
+    def info(str):
+        print("\033[32m"+"INFO: "+"\033[0m"+str)
+
+    @staticmethod
+    def warning(str):
+        print("\033[33m"+"WARN: "+str+"\033[0m")

waydroid_extras.py

@@ -1,594 +0,0 @@
-import configparser
-import sys
-import os
-import hashlib
-import shutil
-import zipfile
-import subprocess
-import argparse
-import platform
-from tqdm import tqdm
-import requests
-import re
-
-download_loc = ""
-if os.environ.get("XDG_CACHE_HOME", None) is None:
-    download_loc = os.path.join('/', "home", os.environ.get("SUDO_USER", os.environ["USER"]), ".cache", "waydroid_script", "downloads")
-else:
-    os.path.join(os.environ["XDG_CACHE_HOME"], "waydroid_script", "downloads")
-
-print(download_loc)
-
-if not os.path.exists(download_loc):
-    os.makedirs(download_loc)
-
-def stop_waydroid():
-    print("==> Stopping waydroid and unmounting already mounted images...")
-    os.system("waydroid container stop &> /dev/null")
-    os.system("umount /var/lib/waydroid/rootfs/vendor/waydroid.prop &> /dev/null")
-    os.system("umount /var/lib/waydroid/rootfs/vendor &> /dev/null")
-    os.system("umount /var/lib/waydroid/rootfs &> /dev/null")
-
-def download_file(url, f_name):
-    md5 = ""
-    response = requests.get(url, stream=True)
-    total_size_in_bytes = int(response.headers.get('content-length', 0))
-    block_size = 1024  # 1 Kibibyte
-    progress_bar = tqdm(total=total_size_in_bytes, unit='iB', unit_scale=True)
-    with open(f_name, 'wb') as file:
-        for data in response.iter_content(block_size):
-            progress_bar.update(len(data))
-            file.write(data)
-    progress_bar.close()
-    with open(f_name, "rb") as f:
-        bytes = f.read()
-        md5 = hashlib.md5(bytes).hexdigest()
-    if total_size_in_bytes != 0 and progress_bar.n != total_size_in_bytes:
-        print("==> Something went wrong while downloading")
-        sys.exit(1)
-    return md5
-
-def get_image_dir():
-    # Read waydroid config to get image location
-    cfg = configparser.ConfigParser()
-    cfg_file = os.environ.get("WAYDROID_CONFIG", "/var/lib/waydroid/waydroid.cfg")
-    if not os.path.isfile(cfg_file):
-        print("==> Cannot locate waydroid config file, reinit wayland and try again !")
-        sys.exit(1)
-
-    cfg.read(cfg_file)
-    if "waydroid" not in cfg:
-        print("==> Required entry in config was not found, Cannot continue !s")
-        sys.exit(1)
-    return cfg["waydroid"]["images_path"]
-
-def mount_image(image, mount_point):
-    print("==> Unmounting .. ")
-    try:
-        subprocess.check_output(["losetup", "-D"], stderr=subprocess.STDOUT)
-        subprocess.check_output(["umount", mount_point], stderr=subprocess.STDOUT)
-    except subprocess.CalledProcessError as e:
-        print("==> Warning: umount failed.. {} ".format(str(e.output.decode())))
-    if not os.path.exists(mount_point):
-        os.makedirs(mount_point)
-    try:
-        subprocess.check_output(["mount", "-o", "rw", image, mount_point], stderr=subprocess.STDOUT)
-    except subprocess.CalledProcessError as e:
-        print("==> Failed to mount system image... !  {}".format(str(e.output.decode())))
-        sys.exit(1)
-
-def resize_img(img_file, size):
-    # Resize the system image
-    print("==> Resizing system image....")
-    try:
-        subprocess.check_output(["e2fsck -y -f "+img_file], stderr=subprocess.STDOUT, shell=True)
-        subprocess.check_output(["resize2fs '{}' {}".format(img_file, size)], stderr=subprocess.STDOUT, shell=True)
-    except subprocess.CalledProcessError as e:
-        print("==> Failed to resize image '{}' .. !  {}".format(img_file, str(e.output.decode())))
-        p = input("==> You can exit and retry with sudo or force continue (May fail installation !), Continue ? [y/N]: ")
-        if not p.lower() == "y":
-            sys.exit(1)
-
-
-def install_gapps():
-
-    dl_links = {
-            "x86_64": ["https://master.dl.sourceforge.net/project/opengapps/x86_64/20220121/open_gapps-x86_64-10.0-pico-20220121.zip?viasf=1", "e8c9a7412f5712eea7948957a62a7d66"],
-            "x86": ["https://udomain.dl.sourceforge.net/project/opengapps/x86/20220122/open_gapps-x86-10.0-pico-20220122.zip", "9e39e45584b7ade4529e6be654af7b81"],
-            "aarch64": ["https://liquidtelecom.dl.sourceforge.net/project/opengapps/arm64/20220122/open_gapps-arm64-10.0-pico-20220122.zip", "8dfa6e76aeb2d1d5aed40b058e8a852c"],
-            "arm": ["https://nav.dl.sourceforge.net/project/opengapps/arm/20220122/open_gapps-arm-10.0-pico-20220122.zip", "a48ccbd25eb0a3c5e30f5db5435f5536"]
-        }
-    if platform.machine() not in dl_links.keys():
-        print("==> Unsupported architecture '{}' .. ".format(platform.machine()))
-        sys.exit(1)
-    google_apps_dl_link = dl_links[platform.machine()][0]
-    dl_file_name = os.path.join(download_loc, "open_gapps.zip")
-    act_md5 = dl_links[platform.machine()][1]
-    loc_md5 = ""
-    sys_image_mount = "/tmp/waydroidimage"
-    extract_to = "/tmp/ogapps/extract"
-    non_apks = [
-        "defaultetc-common.tar.lz",
-        "defaultframework-common.tar.lz",
-        "googlepixelconfig-common.tar.lz"
-        ]
-    skip = [
-        "setupwizarddefault-x86_64.tar.lz",
-        "setupwizardtablet-x86_64.tar.lz"
-        ]
-
-    if not os.path.exists(extract_to):
-        os.makedirs(extract_to)
-    if not os.path.exists(os.path.join(extract_to, "appunpack")):
-        os.makedirs(os.path.join(extract_to, "appunpack"))
-
-    if os.path.isfile(dl_file_name):
-        with open(dl_file_name,"rb") as f:
-            bytes = f.read()
-            loc_md5 = hashlib.md5(bytes).hexdigest()
-    print("==> Excepted hash: {}  | File hash: {}".format(act_md5, loc_md5))
-
-
-    system_img = os.path.join(get_image_dir(), "system.img")
-    if not os.path.isfile(system_img):
-        print("The system image path '{}' from waydroid config is not valid !".format(system_img))
-        sys.exit(1)
-    print("==> Found system image: "+system_img)
-
-    img_size = int(os.path.getsize(system_img)/(1024*1024))
-
-    # Resize image to get some free space
-    resize_img(system_img, "{}M".format(img_size+500))
-
-    # Mount the system image
-    mount_image(system_img, sys_image_mount)
-
-    # Download the file if hash mismatches or if file does not exist
-    while not os.path.isfile(dl_file_name) or loc_md5 != act_md5:
-        if os.path.isfile(dl_file_name):
-            os.remove(dl_file_name)
-        print("==> OpenGapps zip not downloaded or hash mismatches, downloading now .....")
-        loc_md5 = download_file(google_apps_dl_link, dl_file_name)
-
-    # Extract opengapps
-    print("==> Extracting opengapps...")
-    with zipfile.ZipFile(dl_file_name) as z:
-            z.extractall(extract_to)
-
-    # Now copy the files
-    for lz_file in os.listdir(os.path.join(extract_to, "Core")):
-        for d in os.listdir(os.path.join(extract_to, "appunpack")):
-            shutil.rmtree(os.path.join(extract_to, "appunpack", d))
-        if lz_file not in skip:
-            if lz_file not in non_apks:
-                print("==> Processing app package : "+os.path.join(extract_to, "Core", lz_file))
-                os.system("tar --lzip -xvf '{}' -C '{}'>/dev/null".format(os.path.join(extract_to, "Core", lz_file), os.path.join(extract_to, "appunpack")))
-                app_name = os.listdir(os.path.join(extract_to, "appunpack"))[0]
-                xx_dpi = os.listdir(os.path.join(extract_to, "appunpack", app_name))[0]
-                app_priv = os.listdir(os.path.join(extract_to, "appunpack", app_name, "nodpi"))[0]
-                app_src_dir = os.path.join(extract_to, "appunpack", app_name, xx_dpi, app_priv)
-                for app in os.listdir(app_src_dir):
-                    shutil.copytree(os.path.join(app_src_dir, app), os.path.join(sys_image_mount, "system", "priv-app", app), dirs_exist_ok=True)
-            else:
-                print("==> Processing extra package : "+os.path.join(extract_to, "Core", lz_file))
-                os.system("tar --lzip -xvf '{}' -C '{}'>/dev/null".format(os.path.join(extract_to, "Core", lz_file), os.path.join(extract_to, "appunpack")))
-                app_name = os.listdir(os.path.join(extract_to, "appunpack"))[0]
-                common_content_dirs = os.listdir(os.path.join(extract_to, "appunpack", app_name, "common"))
-                for ccdir in common_content_dirs:
-                    shutil.copytree(os.path.join(extract_to, "appunpack", app_name, "common", ccdir), os.path.join(sys_image_mount, "system", ccdir), dirs_exist_ok=True)
-    print("==> Unmounting .. ")
-    try:
-        subprocess.check_output(["umount", sys_image_mount], stderr=subprocess.STDOUT)
-    except subprocess.CalledProcessError as e:
-        print("==> Warning: umount failed.. {} ".format(str(e.output.decode())))
-    print("==> OpenGapps installation complete try re init /restarting waydroid")
-    print("==> Please note, google apps wont be usable without device registration !, Use --get-android-id for registration instructions")
-
-
-def get_android_id():
-    try:
-        if not os.path.isfile("/var/lib/waydroid/data/data/com.google.android.gsf/databases/gservices.db"):
-            print("Cannot access gservices.db, make sure gapps is installed and waydroid was started at least once after installation and make sure waydroid is running !")
-            sys.exit(1)
-        sqs = """
-                SELECT * FROM main WHERE name='android_id'
-            """
-        queryout = subprocess.check_output(["sqlite3", "/var/lib/waydroid/data/data/com.google.android.gsf/databases/gservices.db", sqs.strip()], stderr=subprocess.STDOUT)
-        print(queryout.decode().replace("android_id|", "").strip())
-        print("   ^----- Open https://google.com/android/uncertified/?pli=1")
-        print("          Login with your google id then submit the form with id shown above")
-    except subprocess.CalledProcessError as e:
-        print("==> Error getting id... '{}' ".format(str(e.output.decode())))
-
-def install_ndk():
-    sys_image_mount = "/tmp/waydroidimage"
-    ndk_zip_url = "https://github.com/newbit1/libndk_translation_Module/archive/c6077f3398172c64f55aad7aab0e55fad9110cf3.zip"
-    dl_file_name = os.path.join(download_loc, "libndktranslation.zip")
-    extract_to = "/tmp/libndkunpack" #All catalog files will be marked as executable!
-    act_md5 = "5e8e0cbde0e672fdc2b47f20a87472fd"
-    loc_md5 = ""
-    apply_props = {
-        "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",
-        "ro.enable.native.bridge.exec": "1",
-        "ro.ndk_translation.version": "0.2.2",
-        "ro.dalvik.vm.isa.arm": "x86",
-        "ro.dalvik.vm.isa.arm64": "x86_64"
-        }
-    init_rc_component = """
-on early-init
-    mount -t binfmt_misc binfmt_misc /proc/sys/fs/binfmt_misc
-
-on property:ro.enable.native.bridge.exec=1
-    exec -- /system/bin/sh -c "cat /system/etc/binfmt_misc/arm_exe > /proc/sys/fs/binfmt_misc/register"
-    exec -- /system/bin/sh -c "cat /system/etc/binfmt_misc/arm_dyn >> /proc/sys/fs/binfmt_misc/register"
-    exec -- /system/bin/sh -c "cat /system/etc/binfmt_misc/arm64_exe >> /proc/sys/fs/binfmt_misc/register"
-    exec -- /system/bin/sh -c "cat /system/etc/binfmt_misc/arm64_dyn >> /proc/sys/fs/binfmt_misc/register"
-    """
-    if os.path.isfile(dl_file_name):
-        with open(dl_file_name,"rb") as f:
-            bytes = f.read()
-            loc_md5 = hashlib.md5(bytes).hexdigest()
-
-    system_img = os.path.join(get_image_dir(), "system.img")
-    if not os.path.isfile(system_img):
-        print("The system image path '{}' from waydroid config is not valid !".format(system_img))
-        sys.exit(1)
-    print("==> Found system image: "+system_img)
-
-    # Resize rootfs
-    img_size = int(os.path.getsize(system_img)/(1024*1024))
-
-    # Resize image to get some free space
-    resize_img(system_img, "{}M".format(img_size+50))
-
-    # Mount the system image
-    mount_image(system_img, sys_image_mount)
-
-    # Download the file if hash mismatches or if file does not exist
-    while not os.path.isfile(dl_file_name) or loc_md5 != act_md5:
-        if os.path.isfile(dl_file_name):
-            os.remove(dl_file_name)
-        print("==> NDK Translation zip not downloaded or hash mismatches, downloading now .....")
-        loc_md5 = download_file(ndk_zip_url, dl_file_name)
-
-    # Extract ndk files
-    print("==> Extracting archive...")
-    with zipfile.ZipFile(dl_file_name) as z:
-            z.extractall(extract_to)
-
-    #Mark ndk files as executable
-    print("==> Chmodding...")
-    try: os.system("chmod +x "+extract_to+" -R")
-    except: print("==> Couldn't mark files as executable!")
-    
-    # Copy library file
-    print("==> Copying library files ...")
-    shutil.copytree(os.path.join(extract_to, "libndk_translation_Module-c6077f3398172c64f55aad7aab0e55fad9110cf3", "system"), os.path.join(sys_image_mount, "system"), dirs_exist_ok=True)
-
-    # Add entries to build.prop
-    print("==> Adding arch in build.prop")
-    with open(os.path.join(sys_image_mount, "system", "build.prop"), "r") as propfile:
-        prop_content = propfile.read()
-        for key in apply_props:
-            if key not in prop_content:
-                prop_content = prop_content+"\n{key}={value}".format(key=key, value=apply_props[key])
-            else:
-                p = re.compile(r"^{key}=.*$".format(key=key), re.M)
-                prop_content = re.sub(p, "{key}={value}".format(key=key, value=apply_props[key]), prop_content)
-    with open(os.path.join(sys_image_mount, "system", "build.prop"), "w") as propfile:
-        propfile.write(prop_content)
-
-
-    # Add entry to init.rc
-    print("==> Adding entry to init.rc")
-    # Check if init.rc is located in Android 11's path
-    init_path = os.path.join(sys_image_mount, "system", "etc", "init", "hw", "init.rc")
-    if not os.path.isfile(init_path):
-        # init.rc not found, assuming it's located in the root folder (Android 10 and older)
-        init_path = os.path.join(sys_image_mount, "init.rc")
-    with open(init_path, "r") as initfile:
-        initcontent = initfile.read()
-        if init_rc_component not in initcontent:
-            initcontent=initcontent+init_rc_component
-    with open(init_path, "w") as initfile:
-        initfile.write(initcontent)
-
-    # Unmount and exit
-    print("==> Unmounting .. ")
-    try:
-        subprocess.check_output(["umount", sys_image_mount], stderr=subprocess.STDOUT)
-    except subprocess.CalledProcessError as e:
-        print("==> Warning: umount failed.. {} ".format(str(e.output.decode())))
-
-    print("==> libndk translation installed ! Restart waydroid service to apply changes !")
-
-
-def install_houdini():
-    sys_image_mount = "/tmp/waydroidimage"
-    houdini_zip_url = "https://raw.githubusercontent.com/casualsnek/miscpackages/main/libhoudini_a11.zip"
-    dl_file_name = os.path.join(download_loc, "libhoudini.zip")
-    extract_to = "/tmp/houdiniunpack" #All catalog files will be marked as executable!
-    act_md5 = "c9a80831641de8fd44ccf93a0ad8b585"
-    loc_md5 = ""
-
-    apply_props = {
-        "ro.product.cpu.abilist": "x86_64,x86,arm64-v8a,armeabi-v7a,armeabi",
-        "ro.product.cpu.abilist32": "x86,armeabi-v7a,armeabi",
-        "ro.product.cpu.abilist64": "x86_64,arm64-v8a",
-        "ro.dalvik.vm.native.bridge": "libhoudini.so",
-        "ro.enable.native.bridge.exec": "1",
-        "ro.dalvik.vm.isa.arm": "x86",
-        "ro.dalvik.vm.isa.arm64": "x86_64"
-        }
-    init_rc_component = """
-on early-init
-    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"
-    exec -- /system/bin/sh -c "echo ':arm_dyn:M::\\\\x7f\\\\x45\\\\x4c\\\\x46\\\\x01\\\\x01\\\\x01\\\\x00\\\\x00\\\\x00\\\\x00\\\\x00\\\\x00\\\\x00\\\\x00\\\\x00\\\\x03\\\\x00\\\\x28::/system/bin/houdini:P' >> /proc/sys/fs/binfmt_misc/register"
-    exec -- /system/bin/sh -c "echo ':arm64_exe:M::\\\\x7f\\\\x45\\\\x4c\\\\x46\\\\x02\\\\x01\\\\x01\\\\x00\\\\x00\\\\x00\\\\x00\\\\x00\\\\x00\\\\x00\\\\x00\\\\x00\\\\x02\\\\x00\\\\xb7::/system/bin/houdini64:P' >> /proc/sys/fs/binfmt_misc/register"
-    exec -- /system/bin/sh -c "echo ':arm64_dyn:M::\\\\x7f\\\\x45\\\\x4c\\\\x46\\\\x02\\\\x01\\\\x01\\\\x00\\\\x00\\\\x00\\\\x00\\\\x00\\\\x00\\\\x00\\\\x00\\\\x00\\\\x03\\\\x00\\\\xb7::/system/bin/houdini64:P' >> /proc/sys/fs/binfmt_misc/register"
-    """
-
-    if os.path.isfile(dl_file_name):
-        with open(dl_file_name,"rb") as f:
-            bytes = f.read()
-            loc_md5 = hashlib.md5(bytes).hexdigest()
-
-    system_img = os.path.join(get_image_dir(), "system.img")
-    if not os.path.isfile(system_img):
-        print("The system image path '{}' from waydroid config is not valid !".format(system_img))
-        sys.exit(1)
-    print("==> Found system image: "+system_img)
-
-    img_size = int(os.path.getsize(system_img)/(1024*1024))
-
-    # Resize image to get some free space
-    resize_img(system_img, "{}M".format(img_size+300))
-
-
-    # Mount the system image
-    mount_image(system_img, sys_image_mount)
-
-    # Download the file if hash mismatches or if file does not exist
-    while not os.path.isfile(dl_file_name) or loc_md5 != act_md5:
-        if os.path.isfile(dl_file_name):
-            os.remove(dl_file_name)
-        print("==> libhoudini zip not downloaded or hash mismatches, downloading now .....")
-        loc_md5 = download_file(houdini_zip_url, dl_file_name)
-
-    # Extract ndk files
-    print("==> Extracting archive...")
-    with zipfile.ZipFile(dl_file_name) as z:
-            z.extractall(extract_to)
-
-    # Mark libhoudini files as executable
-    print("==> Chmodding...")
-    try: os.system("chmod +x "+extract_to+" -R")
-    except: print("==> Couldn't mark files as executable!")
-
-    # Copy library file
-    print("==> Copying library files ...")
-    shutil.copytree(os.path.join(extract_to, "system"), os.path.join(sys_image_mount, "system"), dirs_exist_ok=True)
-
-    # Add entries to build.prop
-    print("==> Adding arch in build.prop")
-    with open(os.path.join(sys_image_mount, "system", "build.prop"), "r") as propfile:
-        prop_content = propfile.read()
-        for key in apply_props:
-            if key not in prop_content:
-                prop_content = prop_content+"\n{key}={value}".format(key=key, value=apply_props[key])
-            else:
-                p = re.compile(r"^{key}=.*$".format(key=key), re.M)
-                prop_content = re.sub(p, "{key}={value}".format(key=key, value=apply_props[key]), prop_content)
-    with open(os.path.join(sys_image_mount, "system", "build.prop"), "w") as propfile:
-        propfile.write(prop_content)
-
-    # Add entry to init.rc
-    print("==> Adding entry to init.rc")
-    # Check if init.rc is located in Android 11's path
-    init_path = os.path.join(sys_image_mount, "system", "etc", "init", "hw", "init.rc")
-    if not os.path.isfile(init_path):
-        # init.rc not found, assuming it's located in the root folder (Android 10 and older)
-        init_path = os.path.join(sys_image_mount, "init.rc")
-    with open(init_path, "r") as initfile:
-        initcontent = initfile.read()
-        if init_rc_component not in initcontent:
-            initcontent=initcontent+init_rc_component
-    with open(init_path, "w") as initfile:
-        initfile.write(initcontent)
-
-    # Unmount and exit
-    print("==> Unmounting .. ")
-    try:
-        subprocess.check_output(["umount", sys_image_mount], stderr=subprocess.STDOUT)
-    except subprocess.CalledProcessError as e:
-        print("==> Warning: umount failed.. {} ".format(str(e.output.decode())))
-
-    print("==> libhoudini translation installed ! Restart waydroid service to apply changes !")
-
-
-def install_magisk():
-    dl_link = "https://github.com/topjohnwu/Magisk/releases/download/v20.4/Magisk-v20.4.zip"
-    busybox_dl_link = "https://github.com/Gnurou/busybox-android/raw/master/busybox-android"
-    busybox_dl_file_name = os.path.join(download_loc, "busybox-android")
-    dl_file_name = os.path.join(download_loc, "magisk.zip")
-    extract_to = "/tmp/magisk_unpack"
-    act_md5 = "9503fc692e03d60cb8897ff2753c193f"
-    busybox_act_md5 = "2e43cc2e8f44b83f9029a6561ce5d8b9"
-    sys_image_mount = "/tmp/waydroidimage"
-    loc_md5 = ""
-    busybox_loc_md5 = ""
-    magisk_init = """#!/system/bin/sh
-mount -o remount,rw /
-rm /sbin/magisk /sbin/magiskpolicy /sbin/magiskinit
-cp /magiskinit /sbin/magiskinit
-ln -s /sbin/magiskinit /sbin/magisk
-ln -s /sbin/magiskinit /sbin/magiskpolicy
-mkdir -p /data/adb/magisk
-cp /busybox /data/adb/magisk/busybox
-cp /util_functions.sh /data/adb/magisk/util_functions.sh
-cp /boot_patch.sh /data/adb/magisk/boot_patch.sh
-cp /addon.d.sh /data/adb/magisk/addon.d.sh
-magisk -c >&2
-ln -sf /data /sbin/.magisk/mirror/data
-ln -sf /vendor /sbin/.magisk/mirror/vendor
-magisk --post-fs-data
-sleep 1
-magisk --service
-magisk --boot-complete
-mount -o remount,ro /
-    """
-    init_rc_component = """on property:dev.bootcomplete=1
-    start magisk
-
-service magisk /system/bin/init-magisk.sh
-    class main
-    user root
-    group root
-    oneshot
-    """
-    if os.path.isfile(dl_file_name):
-        with open(dl_file_name,"rb") as f:
-            bytes = f.read()
-            loc_md5 = hashlib.md5(bytes).hexdigest()
-
-    if os.path.isfile(busybox_dl_file_name):
-        with open(busybox_dl_file_name,"rb") as f:
-            bytes = f.read()
-            busybox_loc_md5 = hashlib.md5(bytes).hexdigest()
-
-
-    system_img = os.path.join(get_image_dir(), "system.img")
-    if not os.path.isfile(system_img):
-        print("The system image path '{}' from waydroid config is not valid !".format(system_img))
-        sys.exit(1)
-    print("==> Found system image: " + system_img)
-
-    img_size = int(os.path.getsize(system_img)/(1024*1024))
-
-    # Resize image to get some free space
-    resize_img(system_img, "{}M".format(img_size+50))
-
-    # Mount the system image
-    mount_image(system_img, sys_image_mount)
-
-    # Download magisk
-    while not os.path.isfile(dl_file_name) or loc_md5 != act_md5:
-        if os.path.isfile(dl_file_name):
-            os.remove(dl_file_name)
-        print("==> Magisk zip not downloaded or hash mismatches, downloading now .....")
-        loc_md5 = download_file(dl_link, dl_file_name)
-
-    # Download busybox android binary
-    while not os.path.isfile(busybox_dl_file_name) or busybox_loc_md5 != busybox_act_md5:
-        if os.path.isfile(busybox_dl_file_name):
-            os.remove(busybox_dl_file_name)
-        print("==> BusyBox binary not downloaded or hash mismatches, downloading now .....")
-        busybox_loc_md5 = download_file(busybox_dl_link, busybox_dl_file_name)
-
-    # Extract magisk files
-    print("==> Extracting archive...")
-    with zipfile.ZipFile(dl_file_name) as z:
-        z.extractall(extract_to)
-
-    # Now setup and install magisk binary and app
-    print("==> Installing magisk now ...")
-    with open(os.path.join(sys_image_mount, "system", "bin", "init-magisk.sh"), "w") as imf:
-        imf.write(magisk_init)
-    os.system("chmod 755 {}".format(os.path.join(sys_image_mount, "system", "bin", "init-magisk.sh")))
-    arch_dir = "x86" if "x86" in platform.machine() else "arm"
-    arch = "64" if "64" in platform.machine() else ""
-    shutil.copyfile(os.path.join(extract_to, arch_dir, "magiskinit{arch}".format(arch=arch)),
-                    os.path.join(sys_image_mount, "sbin", "magiskinit"))
-    shutil.copyfile(os.path.join(extract_to, arch_dir, "magiskinit{arch}".format(arch=arch)),
-                    os.path.join(sys_image_mount, "magiskinit"))
-    os.system("chmod 755 {} & chmod 755 {}".format(os.path.join(sys_image_mount, "sbin", "magiskinit"), os.path.join(sys_image_mount, "magiskinit")))
-
-    # Copy busybox
-    print("==> Installing BusyBox")
-    shutil.copyfile(busybox_dl_file_name, os.path.join(sys_image_mount, "busybox"))
-    os.system("chmod 755 {}".format(os.path.join(sys_image_mount, "busybox")))
-
-    # Copy files from common directory
-    for file in ["util_functions.sh", "boot_patch.sh", "addon.d.sh"]:
-        shutil.copyfile(os.path.join(extract_to, "common", file),
-                        os.path.join(sys_image_mount, file))
-        os.system("chmod 755 {}".format(os.path.join(sys_image_mount, file)))
-
-    # Create symlinks
-    print("==> Creating symlinks")
-    os.system("cd {root}/sbin && ln -sf magiskinit magiskinit >> /dev/null 2>&1".format(root=sys_image_mount))
-    os.system("cd {root}/sbin && ln -sf magiskinit magisk >> /dev/null 2>&1".format(root=sys_image_mount))
-    print("==>     magiskinit  ->  magisk")
-    os.system("cd {root}/sbin && ln -sf /magiskinit magiskpolicy >> /dev/null 2>&1".format(root=sys_image_mount))
-    print("==>     magiskinit  ->  magiskpolicy")
-
-    # Add entry to init.rc
-    print("==> Adding entry to init.rc")
-    with open(os.path.join(sys_image_mount, "init.rc"), "r") as initfile:
-        initcontent = initfile.read()
-        if init_rc_component not in initcontent:
-            initcontent=initcontent+init_rc_component
-    with open(os.path.join(sys_image_mount, "init.rc"), "w") as initfile:
-        initfile.write(initcontent)
-
-    # Install Magisk apk
-    if not os.path.exists(os.path.join(sys_image_mount, "system", "priv-app", "Magisk")):
-        os.makedirs(os.path.join(sys_image_mount, "system", "priv-app", "Magisk"))
-    shutil.copyfile(os.path.join(extract_to, "common", "magisk.apk"),
-                    os.path.join(sys_image_mount, "system", "priv-app", "Magisk", "magisk.apk"))
-
-    # Unmount and exit
-    print("==> Unmounting .. ")
-    try:
-        subprocess.check_output(["umount", sys_image_mount], stderr=subprocess.STDOUT)
-    except subprocess.CalledProcessError as e:
-        print("==> Warning: umount failed.. {} ".format(str(e.output.decode())))
-
-    print("==> Magisk was  installed ! Restart waydroid service to apply changes !")
-def main():
-    about = """
-    WayDroid Helper script v0.3
-    Does stuff like installing Gapps, Installing NDK Translation and getting Android ID for device registration.
-    Use -h  flag for help !
-    """
-    parser = argparse.ArgumentParser(description=about, formatter_class=argparse.RawDescriptionHelpFormatter)
-    parser.add_argument('-g', '--install-gapps',
-                        dest='install',
-                        help='Install OpenGapps to waydroid',
-                        action='store_true')
-    parser.add_argument('-n', '--install-ndk-translation',
-                        dest='installndk',
-                        help='Install experimental libndk translation files',
-                        action='store_true')
-    parser.add_argument('-i', '--get-android-id', dest='getid',
-                        help='Displays your android id for manual registration',
-                        action='store_true')
-    parser.add_argument('-m', '--install-magisk', dest='magisk',
-                        help='Attempts to install Magisk ( Bootless )',
-                        action='store_true')
-    parser.add_argument('-l', '--install-libhoudini', dest='houdini',
-                        help='Install libhoudini for arm translation',
-                        action='store_true')
-
-    args = parser.parse_args()
-    if args.install:
-        stop_waydroid()
-        install_gapps()
-    elif args.installndk:
-        stop_waydroid()
-        install_ndk()
-    elif args.getid:
-        get_android_id()
-    elif args.magisk:
-        install_magisk()
-    elif args.houdini:
-        install_houdini()
-
-if __name__ == "__main__":
-    main()