priyatham/waydroid_script
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: ndk translation prop

Browse source
This commit is contained in:
Rikka 2023-05-01 16:15:45 +08:00
parent ab334ebfc3
commit 0ab4b1c0f7
No known key found for this signature in database
GPG key ID: CD36B07FA9F7D2AA
2 changed files with 5 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
main.py
View file

@ -66,7 +66,7 @@ def install_app(args):
if "libndk" in app and "houdini" not in app: if "libndk" in app and "houdini" not in app:
arch = helper.host()[0] arch = helper.host()[0]
if arch == "x86_64": if arch == "x86_64":
install_list.append(Ndk(args.android_version)) install_list.append(Ndk())
else: else:
Logger.warn("libndk is not supported on your CPU") Logger.warn("libndk is not supported on your CPU")
if "libhoudini" in app and "ndk" not in app: if "libhoudini" in app and "ndk" not in app:
@ -119,7 +119,7 @@ def remove_app(args):
if "gapps" in app: if "gapps" in app:
remove_list.append(Gapps(args.android_version)) remove_list.append(Gapps(args.android_version))
if "libndk" in app and "houdini" not in app: if "libndk" in app and "houdini" not in app:
remove_list.append(Ndk(args.android_version)) remove_list.append(Ndk())
if "libhoudini" in app and "ndk" not in app: if "libhoudini" in app and "ndk" not in app:
remove_list.append(Houdini(args.android_version)) remove_list.append(Houdini(args.android_version))
if "magisk" in app: if "magisk" in app:

14
stuffs/ndk.py
View file

@ -15,9 +15,9 @@ class Ndk(General):
"ro.product.cpu.abilist32": "x86,armeabi-v7a,armeabi", "ro.product.cpu.abilist32": "x86,armeabi-v7a,armeabi",
"ro.product.cpu.abilist64": "x86_64,arm64-v8a", "ro.product.cpu.abilist64": "x86_64,arm64-v8a",
"ro.dalvik.vm.native.bridge": "libndk_translation.so", "ro.dalvik.vm.native.bridge": "libndk_translation.so",
"ro.enable.native.bridge.exec": None, "ro.enable.native.bridge.exec": "1",
"ro.vendor.enable.native.bridge.exec": None, "ro.vendor.enable.native.bridge.exec": "1",
"ro.vendor.enable.native.bridge.exec64": None, "ro.vendor.enable.native.bridge.exec64": "1",
"ro.ndk_translation.version": "0.2.3", "ro.ndk_translation.version": "0.2.3",
"ro.dalvik.vm.isa.arm": "x86", "ro.dalvik.vm.isa.arm": "x86",
"ro.dalvik.vm.isa.arm64": "x86_64" "ro.dalvik.vm.isa.arm64": "x86_64"
@ -36,14 +36,6 @@ class Ndk(General):
"lib/libndk*", "lib/libndk*",
"lib64/libndk*" "lib64/libndk*"
] ]
def __init__(self, android_version="11") -> None:
super().__init__()
if android_version=="11":
self.apply_props["ro.enable.native.bridge.exec"] = "1"
elif android_version=="13":
self.apply_props["ro.vendor.enable.native.bridge.exec"] = "1"
self.apply_props["ro.vendor.enable.native.bridge.exec64"] = "1"
def copy(self): def copy(self):
Logger.info("Copying libndk library files ...") Logger.info("Copying libndk library files ...")