From b4e890dfa8c33bb4a05f5721c358a5aaecba25fe Mon Sep 17 00:00:00 2001
From: Adeel Mujahid <3840695+am11@users.noreply.github.com>
Date: Sun, 5 Jul 2026 16:50:39 +0300
Subject: [PATCH 1/3] Align keepnativesymbols option with src/tests/build

Updated note about building the runtime with debug symbols.
---
 docs/workflow/building/coreclr/android.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/workflow/building/coreclr/android.md b/docs/workflow/building/coreclr/android.md
index f23bfaa9295554..dcf260b90518d2 100644
--- a/docs/workflow/building/coreclr/android.md
+++ b/docs/workflow/building/coreclr/android.md
@@ -201,9 +201,9 @@ This can be achieved in `Android Studio` via `Profile or Debug APK`.
 
 > [!NOTE]
 > Steps 5) through 8) can be omitted if the runtime is built without stripping debug symbols to a separate file (e.g., `libcoreclr.so.dbg`).
-> This can be achieved by including `-keepnativesymbols true` option when building the runtime, e.g.,:
+> This can be achieved by including `-keepnativesymbols` option when building the runtime, e.g.,:
 > ```
-> ./build.sh clr.runtime+clr.alljits+clr.corelib+clr.nativecorelib+clr.tools+clr.packages+libs -os android -arch <x64|arm64> -c Debug -keepnativesymbols true
+> ./build.sh clr.runtime+clr.alljits+clr.corelib+clr.nativecorelib+clr.tools+clr.packages+libs -os android -arch <x64|arm64> -c Debug -keepnativesymbols
 > ```
 
 ## See also

From 512dc5c620ab3aa63ef01906d680ca92dffc8c15 Mon Sep 17 00:00:00 2001
From: Adeel Mujahid <3840695+am11@users.noreply.github.com>
Date: Sun, 5 Jul 2026 16:52:55 +0300
Subject: [PATCH 2/3] .

---
 eng/build.sh | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/eng/build.sh b/eng/build.sh
index d6b0ae14212ae1..6a203324d61baa 100755
--- a/eng/build.sh
+++ b/eng/build.sh
@@ -86,7 +86,7 @@ usage()
   echo "  --gcc                      Optional argument to build using gcc in PATH (default)."
   echo "  --gccx.y                   Optional argument to build using gcc version x.y."
   echo "  --portablebuild            Optional argument: set to false to force a non-portable build."
-  echo "  --keepnativesymbols        Optional argument: set to true to keep native symbols/debuginfo in generated binaries."
+  echo "  --keepnativesymbols        Optional argument: set to keep native symbols/debuginfo in generated binaries."
   echo "  --ninja                    Optional argument: use Ninja instead of Make (default: true, use --ninja false to disable)."
   echo "  --pgoinstrument            Optional argument: build PGO-instrumented runtime"
   echo "  --fsanitize                Optional argument: Specify native sanitizers to instrument the native build with. Supported values are: 'address'."
@@ -506,15 +506,8 @@ while [[ $# -gt 0 ]]; do
       ;;
 
      -keepnativesymbols)
-      if [ -z ${2+x} ]; then
-        echo "No value for keepNativeSymbols is supplied. See help (--help) for supported values." 1>&2
-        exit 1
-      fi
-      passedKeepNativeSymbols="$(echo "$2" | tr "[:upper:]" "[:lower:]")"
-      if [ "$passedKeepNativeSymbols" = true ]; then
         arguments+=("/p:KeepNativeSymbols=true")
-      fi
-      shift 2
+      shift 1
       ;;
 
 

From ae4e2d4742bd65f20b204d430b7c3cde032b2f89 Mon Sep 17 00:00:00 2001
From: Adeel Mujahid <3840695+am11@users.noreply.github.com>
Date: Sun, 5 Jul 2026 16:56:29 +0300
Subject: [PATCH 3/3] .

---
 eng/build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/build.sh b/eng/build.sh
index 6a203324d61baa..b4496e0bc362f1 100755
--- a/eng/build.sh
+++ b/eng/build.sh
@@ -506,7 +506,7 @@ while [[ $# -gt 0 ]]; do
       ;;
 
      -keepnativesymbols)
-        arguments+=("/p:KeepNativeSymbols=true")
+      arguments+=("/p:KeepNativeSymbols=true")
       shift 1
       ;;