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