From 13c4f1edd383c81636e4a3f42ccea8af79492bea Mon Sep 17 00:00:00 2001 From: DGdev91 Date: Fri, 26 Nov 2021 23:48:50 +0100 Subject: [PATCH] Got rid of ANDROID_VERSION env variable, check for image Android version in ndk and libhoudini install This also fixes libhoudini install for Android 10 images --- waydroid_extras.py | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/waydroid_extras.py b/waydroid_extras.py index 409233e..c34c642 100644 --- a/waydroid_extras.py +++ b/waydroid_extras.py @@ -268,7 +268,11 @@ on property:ro.enable.native.bridge.exec=1 # Add 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: initcontent = initfile.read() if init_rc_component not in initcontent: @@ -367,8 +371,11 @@ on property:ro.enable.native.bridge.exec=1 # Add entry to init.rc print("==> Adding entry to init.rc") - print("==> Set android version: {}".format(os.environ.get("ANDROID_VERSION", "11"))) - 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") + # 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: initcontent = initfile.read() if init_rc_component not in initcontent: