Make the NativeAOT debugger script more flexible (#10016)

* Make the NativeAOT debugger script more flexible

Make it able to detect the OS-specific path to the NDK toolchain binaries, as well
as the path to the NDK root directory using a number of environment variables used
at one time or another for this purpose.

Instead of hard-coding path to the `lldb-server` binary, which is located in a
versioned directory, use `clang` itself to print full path to the binary, thus
making the script LLVM version agnostic.

* Maybe it works here too?

* Use prefixed clang binary

* Fixlets

* Add quotes to CLANG_PREFIX values

---------

Co-authored-by: Dean Ellis <[email protected]>

Author: grendello

samples/NativeAOT/runwithdebugger.ps1

@@ -37,21 +37,32 @@ $env:ANDROID_NDK_HOME = $_DEF_NDK_HOME
 # Kill any existing lldb-server processes
 $null = & $ADB shell "run-as net.dot.hellonativeaot killall -q -9 lldb-server" 
 
+$DEVICE_ARCH = & $ADB shell uname -m
+if ( $DEVICE_ARCH -match "aarch64" ) {
+    $CLANG_PREFIX = "aarch64-linux-android21"
+} elseif ( $DEVICE_ARCH -match "x86_64" ) {
+    $CLANG_PREFIX = "x86_64-linux-android21"
+} else {
+    Write-Error "Error: unsupported device architecture $DEVICE_ARCH"
+    exit 1
+}
+
 # Get the appropriate path for Windows NDK
-$NDK_LLDB_PATH = "$env:ANDROID_NDK_HOME\toolchains\llvm\prebuilt\windows-x86_64\lib\clang\19\lib\linux\aarch64\lldb-server"
-if (-not (Test-Path $NDK_LLDB_PATH)) {
-    $NDK_LLDB_PATH = "$env:ANDROID_NDK_HOME\toolchains\llvm\prebuilt\linux-x86_64\lib\clang\19\lib\linux\aarch64\lldb-server"
-    if (-not (Test-Path $NDK_LLDB_PATH)) {
-        $NDK_LLDB_PATH = "$env:ANDROID_NDK_HOME\toolchains\llvm\prebuilt\darwin-x86_64\lib\clang\19\lib\linux\aarch64\lldb-server"
-        if (-not (Test-Path $NDK_LLDB_PATH)) {
-            Write-Error "Could not find lldb-server in any of the expected NDK locations"
+$NDK_CLANG_PATH = "$env:ANDROID_NDK_HOME\toolchains\llvm\prebuilt\windows-x86_64\bin\$CLANG_PREFIX-clang"
+if (-not (Test-Path $NDK_CLANG_PATH)) {
+    $NDK_CLANG_PATH = "$env:ANDROID_NDK_HOME\toolchains\llvm\prebuilt\linux-x86_64\bin\$CLANG_PREFIX-clang"
+    if (-not (Test-Path $NDK_CLANG_PATH)) {
+        $NDK_CLANG_PATH = "$env:ANDROID_NDK_HOME\toolchains\llvm\prebuilt\darwin-x86_64\bin\$CLANG_PREFIX-clang"
+        if (-not (Test-Path $NDK_CLANG_PATH)) {
+            Write-Error "Could not find clang in any of the expected NDK locations"
             exit 1
         }
     }
 }
 
+$NDK_LLDB_PATH= & $NDK_CLANG_PATH -print-file-name=lldb-server
 # Push lldb-server to device
-& $ADB push $NDK_LLDB_PATH /data/local/tmp/lldb-server
+& $ADB push "$NDK_LLDB_PATH" /data/local/tmp/lldb-server
 & $ADB shell run-as net.dot.hellonativeaot cp /data/local/tmp/lldb-server .
 & $ADB forward tcp:5039 tcp:5039
 

samples/NativeAOT/runwithdebugger.sh

@@ -25,7 +25,29 @@ export ANDROID_NDK_HOME
 # This script is used to run the NativeAOT sample with the debugger attached.
 # It is used by the CI system to verify that the debugger works with NativeAOT.
 adb shell run-as net.dot.hellonativeaot killall -9 lldb-server > /dev/null 2>&1 || true
-adb push $ANDROID_NDK_HOME/toolchains/llvm/prebuilt/darwin-x86_64/lib/clang/19/lib/linux/aarch64/lldb-server /data/local/tmp/lldb-server
+
+case $(uname) in
+    Linux) TOOLCHAIN_OS=linux-x86_64 ;;
+    Darwin) TOOLCHAIN_OS=darwine-x86_64 ;;
+    *) echo "Unsupported OS: $(uname)"; exit 1 ;;
+esac
+
+if [ -n "${ANDROID_NDK_HOME}" ]; then
+    ANDROID_NDK_DIR="${ANDROID_NDK_HOME}"
+elif [ -n "${ANDROID_NDK_ROOT}" ]; then
+    ANDROID_NDK_DIR="${ANDROID_NDK_ROOT}"
+elif [ -n "${ANDROID_NDK_PATH}" ]; then
+    ANDROID_NDK_DIR="${ANDROID_NDK_PATH}"
+fi
+
+DEVICE_ARCH="$(adb shell uname -m)"
+case ${DEVICE_ARCH} in
+    aarch64) CLANG_PREFIX=aarch64-linux-android21 ;;
+    x86_64) CLANG_PREFIX=x86_64-linux-android21 ;;
+    *) echo "Unsupported device architecture ${DEVICE_ARCH}"; exit 1 ;;
+esac
+
+adb push "$("${ANDROID_NDK_DIR}/toolchains/llvm/prebuilt/${TOOLCHAIN_OS}/bin/${CLANG_PREFIX}-clang" -print-file-name=lldb-server)" /data/local/tmp/lldb-server
 adb shell run-as net.dot.hellonativeaot cp /data/local/tmp/lldb-server .
 adb forward tcp:5039 tcp:5039