Merge branch 'main' into patch-1

2025-10-15 17:33:13 -03:00
parent 5bf33e6415 fcb15624db
commit cb81832e4f
6 changed files with 30 additions and 26 deletions
@@ -180,7 +180,7 @@ chmod 777 -R /mnt/*/*/*/*/Android/obb
 ![](assets/7.png)

 ```
-sudo python main.py install microg
+sudo venv/bin/python3 main.py install microg
 ```

 ## Hide status bar
@@ -208,7 +208,7 @@ def interact():
            Choice(name="Android 13", value="13"),
            Choice(name="Exit", value=None)
        ],
-        default="11",
+        default="13",
    ).execute()
    if not android_version:
        exit()
@@ -227,10 +227,9 @@ def interact():
    if not action:
        exit()

-    install_choices = ["gapps", "microg", "libndk", "magisk", "smartdock", "fdroidpriv", ]
+    install_choices = ["gapps", "microg", "libndk", "libhoudini", "magisk", "smartdock", "fdroidpriv", "widevine",]
    hack_choices = []
-    if android_version == "11":
-        install_choices.extend(["libhoudini", "widevine"])
+    if android_version=="11":
        hack_choices.extend(["nodataperm", "hidestatusbar"])

    if action == "Install":
@@ -285,7 +284,7 @@ def main():
    parser.add_argument('-a', '--android-version',
                        dest='android_version',
                        help='Specify the Android version',
-                        default="11",
+                        default="13",
                        choices=["11", "13"])

    # android command
@@ -7,6 +7,8 @@ from stuff.general import General
 class FDroidPriv(General):
    id = "fdroid priv"
    dl_links = {"11": ["https://f-droid.org/repo/org.fdroid.fdroid.privileged.ota_2130.zip",
+                       "6242cab56d197d80c598593a46da62e4"],
+               "13": ["https://f-droid.org/repo/org.fdroid.fdroid.privileged.ota_2130.zip",
                       "6242cab56d197d80c598593a46da62e4"]}
    partition = "system"
    dl_file_name = "org.fdroid.fdroid.privileged.ota_2130.zip"
@@ -10,10 +10,8 @@ class Houdini(General):
    id = "libhoudini"
    partition = "system"
    dl_links = {
-        "11": [
-            "https://github.com/supremegamers/vendor_intel_proprietary_houdini/archive/81f2a51ef539a35aead396ab7fce2adf89f46e88.zip",
-            "fbff756612b4144797fbc99eadcb6653"],
-        # "13": ["https://github.com/supremegamers/vendor_intel_proprietary_houdini/archive/978d8cba061a08837b7e520cd03b635af643ba08.zip", "1e139054c05034648fae58a1810573b4"]
+        "11": ["https://github.com/supremegamers/vendor_intel_proprietary_houdini/archive/81f2a51ef539a35aead396ab7fce2adf89f46e88.zip", "fbff756612b4144797fbc99eadcb6653"],
+        "13": ["https://github.com/supremegamers/vendor_intel_proprietary_houdini/archive/7e21ea3f63bd89e9e8af54e32da41bd8b65c93a1.zip", "f8cf5db10e5fdb9b77e98e515a9b08c9"]
    }
    act_md5 = ...
    dl_link = ...
@@ -10,17 +10,13 @@ class Ndk(General):
    id = "libndk"
    partition = "system"
    dl_links = {
-        "11": [
-            "https://github.com/supremegamers/vendor_google_proprietary_ndk_translation-prebuilt/archive/9324a8914b649b885dad6f2bfd14a67e5d1520bf.zip",
-            "c9572672d1045594448068079b34c350"],
-        "13": [
-            "https://github.com/supremegamers/vendor_google_proprietary_ndk_translation-prebuilt/archive/a090003c60df53a9eadb2df09bd4fd2fa86ea629.zip",
-            "e6f0d9fc28ebc427b59a3942a9a4ffc0"]
+        "11": ["https://github.com/supremegamers/vendor_google_proprietary_ndk_translation-prebuilt/archive/9324a8914b649b885dad6f2bfd14a67e5d1520bf.zip", "c9572672d1045594448068079b34c350"],
+        "13": ["https://github.com/supremegamers/vendor_google_proprietary_ndk_translation-prebuilt/archive/68734c52556d3d7a6db34c603dd9276915c29f2f.zip", "0b2207c490fcb400aa5c87fcf0d52d38"]
    }
    dl_file_name = "libndktranslation.zip"
    extract_to = "/tmp/libndkunpack"
    apply_props = {
-        "ro.product.cpu.abilist": "x86_64,x86,armeabi-v7a,armeabi,arm64-v8a",
+        "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": "libndk_translation.so",
@@ -55,4 +51,4 @@ class Ndk(General):
        Logger.info("Copying libndk library files ...")
        name = re.findall("([a-zA-Z0-9]+)\.zip", self.dl_link)[0]
        shutil.copytree(os.path.join(self.extract_to, "vendor_google_proprietary_ndk_translation-prebuilt-" + name,
-                                     "prebuilts"), os.path.join(self.copy_dir, self.partition), dirs_exist_ok=True)
+                        "prebuilts"), os.path.join(self.copy_dir, self.partition), dirs_exist_ok=True)
@@ -12,12 +12,10 @@ class Widevine(General):
    dl_links = {
        # "x86": ["https://github.com/supremegamers/vendor_google_proprietary_widevine-prebuilt/archive/94c9ee172e3d78fecc81863f50a59e3646f7a2bd.zip", "a31f325453c5d239c21ecab8cfdbd878"],
        "x86_64": {
-            "11": [
-                "https://github.com/supremegamers/vendor_google_proprietary_widevine-prebuilt/archive/48d1076a570837be6cdce8252d5d143363e37cc1.zip",
-                "f587b8859f9071da4bca6cea1b9bed6a"],
-            "13": [
-                "https://github.com/supremegamers/vendor_google_proprietary_widevine-prebuilt/archive/a8524d608431573ef1c9313822d271f78728f9a6.zip",
-                "5c55df61da5c012b4e43746547ab730f"]
+            "11": ["https://github.com/supremegamers/vendor_google_proprietary_widevine-prebuilt/archive/48d1076a570837be6cdce8252d5d143363e37cc1.zip",
+                   "f587b8859f9071da4bca6cea1b9bed6a"],
+            "13": ["https://github.com/WayDroid-ATV/vendor_google_proprietary_widevine-prebuilt/archive/679552343d8b2e8d7a19b6df61c7a03963d0c75b.zip",
+                   "80ab79ea85c7b2556baedb371a54e01c"]
        },
        # "armeabi-v7a": ["https://github.com/supremegamers/vendor_google_proprietary_widevine-prebuilt/archive/a1a19361d36311bee042da8cf4ced798d2c76d98.zip", "fed6898b5cfd2a908cb134df97802554"],
        "arm64-v8a": {
@@ -34,7 +32,10 @@ class Widevine(General):
        "etc/init/*widevine.rc",
        "etc/vintf/manifest/*widevine.xml",
        "lib/libwvhidl.so",
+        "lib/libwvaidl.so",
        "lib/mediadrm",
+        "lib64/libwvhidl.so",
+        "lib64/libwvaidl.so",
        "lib64/mediadrm"
    ]

@@ -42,9 +43,17 @@ class Widevine(General):
        super().__init__()
        self.dl_link = self.dl_links[self.arch[0]][android_version][0]
        self.act_md5 = self.dl_links[self.arch[0]][android_version][1]
+        self.android_version = android_version
+        self.libdir = "lib64" if self.arch[1] == 64 else "lib"

    def copy(self):
        name = re.findall("([a-zA-Z0-9]+)\.zip", self.dl_link)[0]
        Logger.info("Copying widevine library files ...")
-        shutil.copytree(os.path.join(self.extract_to, "vendor_google_proprietary_widevine-prebuilt-" + name,
-                                     "prebuilts"), os.path.join(self.copy_dir, self.partition), dirs_exist_ok=True)
+        shutil.copytree(os.path.join(self.extract_to, "vendor_google_proprietary_widevine-prebuilt-"+name,
+                        "prebuilts"), os.path.join(self.copy_dir, self.partition), dirs_exist_ok=True)
+        if self.android_version == "13":
+            try:
+                os.symlink("libprotobuf-cpp-lite-3.9.1.so",
+                           os.path.join(self.copy_dir, self.partition, self.libdir, "libprotobuf-cpp-lite.so"))
+            except FileExistsError:
+                pass