From 5527d390ebf313f10c2600635708d21846620ac3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=87=91=E9=9B=84=E9=95=95?= Date: Fri, 11 Jul 2025 14:11:33 +0800 Subject: [PATCH 1/4] Reorder ro.product.cpu.abilist to prioritize 64-bit ABIs --- stuff/ndk.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/stuff/ndk.py b/stuff/ndk.py index d07623f..f513cf4 100644 --- a/stuff/ndk.py +++ b/stuff/ndk.py @@ -14,7 +14,7 @@ class Ndk(General): 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", @@ -49,4 +49,4 @@ class Ndk(General): Logger.info("Copying libndk library files ...") name = re.findall("([a-zA-Z0-9]+)\.zip", self.dl_link)[0] shutil.copytree(os.path.join(self.extract_to, "vendor_google_proprietary_ndk_translation-prebuilt-" + name, - "prebuilts"), os.path.join(self.copy_dir, self.partition), dirs_exist_ok=True) \ No newline at end of file + "prebuilts"), os.path.join(self.copy_dir, self.partition), dirs_exist_ok=True) From 3e344b360f64f4a417c4f5e9a3b1aae3da9fdfb9 Mon Sep 17 00:00:00 2001 From: Mio Date: Sun, 13 Jul 2025 12:16:31 +1200 Subject: [PATCH 2/4] fix https://github.com/casualsnek/waydroid_script/issues/229 --- stuff/fdroidpriv.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/stuff/fdroidpriv.py b/stuff/fdroidpriv.py index 1258738..d545017 100644 --- a/stuff/fdroidpriv.py +++ b/stuff/fdroidpriv.py @@ -6,6 +6,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" From db43c7c9cf98a869a4614389c4674ffadbcfdd9c Mon Sep 17 00:00:00 2001 From: Alessandro Astone Date: Mon, 18 Aug 2025 12:41:04 +0200 Subject: [PATCH 3/4] main: Default to A13 Following Waydroid which now defaults to A13 --- main.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/main.py b/main.py index d76f415..9918e43 100755 --- a/main.py +++ b/main.py @@ -210,7 +210,7 @@ def interact(): Choice(name="Android 13", value="13"), Choice(name="Exit", value=None) ], - default="11", + default="13", ).execute() if not android_version: exit() @@ -288,7 +288,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 From fcb15624db0811615ea9800837a836c4777674bf Mon Sep 17 00:00:00 2001 From: Alessandro Astone Date: Sun, 31 Aug 2025 22:55:40 +0200 Subject: [PATCH 4/4] Fix A13 widevine Closes: https://github.com/casualsnek/waydroid_script/issues/236 --- main.py | 3 +-- stuff/widevine.py | 15 +++++++++++++-- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/main.py b/main.py index 9918e43..35bc1fc 100755 --- a/main.py +++ b/main.py @@ -229,10 +229,9 @@ def interact(): if not action: exit() - install_choices = ["gapps", "microg", "libndk", "libhoudini", "magisk", "smartdock", "fdroidpriv",] + install_choices = ["gapps", "microg", "libndk", "libhoudini", "magisk", "smartdock", "fdroidpriv", "widevine",] hack_choices = [] if android_version=="11": - install_choices.extend(["widevine"]) hack_choices.extend(["nodataperm", "hidestatusbar"]) if action == "Install": diff --git a/stuff/widevine.py b/stuff/widevine.py index 316a4a5..ca6d557 100644 --- a/stuff/widevine.py +++ b/stuff/widevine.py @@ -13,8 +13,8 @@ class Widevine(General): "x86_64": { "11": ["https://github.com/supremegamers/vendor_google_proprietary_widevine-prebuilt/archive/48d1076a570837be6cdce8252d5d143363e37cc1.zip", "f587b8859f9071da4bca6cea1b9bed6a"], - "13": ["https://github.com/supremegamers/vendor_google_proprietary_widevine-prebuilt/archive/a8524d608431573ef1c9313822d271f78728f9a6.zip", - "5c55df61da5c012b4e43746547ab730f"] + "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": { @@ -30,7 +30,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" ] @@ -38,9 +41,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) + 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