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

Got rid of ANDROID_VERSION env variable, check for image Android version in ndk and libhoudini install

Browse source 
This also fixes libhoudini install for Android 10 images
This commit is contained in:
DGdev91 2021-11-26 23:48:50 +01:00
parent 6ffcd64242
commit 13c4f1edd3
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
waydroid_extras.py
View file

@ -268,7 +268,11 @@ on property:ro.enable.native.bridge.exec=1
# Add entry to init.rc # Add entry to init.rc
print("==> Adding entry to init.rc") print("==> Adding entry to init.rc")
init_path = os.path.join(sys_image_mount, "system", "etc", "init", "hw", "init.rc") if os.environ.get("ANDROID_VERSION", "10") == "11" else os.path.join(sys_image_mount, "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: with open(init_path, "r") as initfile:
initcontent = initfile.read() initcontent = initfile.read()
if init_rc_component not in initcontent: if init_rc_component not in initcontent:
@ -367,8 +371,11 @@ on property:ro.enable.native.bridge.exec=1
# Add entry to init.rc # Add entry to init.rc
print("==> Adding entry to init.rc") print("==> Adding entry to init.rc")
print("==> Set android version: {}".format(os.environ.get("ANDROID_VERSION", "11"))) # 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 os.environ.get("ANDROID_VERSION", "11") == "11" else os.path.join(sys_image_mount, "init.rc") 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: with open(init_path, "r") as initfile:
initcontent = initfile.read() initcontent = initfile.read()
if init_rc_component not in initcontent: if init_rc_component not in initcontent: