Merge "Plan for GDB removal in NDK r24."
diff --git a/docs/changelogs/Changelog-r23.md b/docs/changelogs/Changelog-r23.md
index bb3b87f..5bcc68b 100644
--- a/docs/changelogs/Changelog-r23.md
+++ b/docs/changelogs/Changelog-r23.md
@@ -13,8 +13,7 @@
removed in the next release. If you are building with `-fno-integrated-as`,
file bugs if anything is preventing you from removing that flag.
-* Support for GDB has ended. The GDB from r22 will continue to be included in
- the NDK, but it will be removed if and when it stops working. Use LLDB
+* Support for GDB has ended. GDB will be removed from the next release. Use LLDB
instead. Note that `ndk-gdb` uses LLDB by default.
## Changes
diff --git a/ndk-gdb.py b/ndk-gdb.py
index 3f68024..9170113 100755
--- a/ndk-gdb.py
+++ b/ndk-gdb.py
@@ -707,8 +707,8 @@
use_lldb = not args.no_lldb
if not use_lldb:
- print("WARNING: --no-lldb was used by GDB is no longer supported.")
- print("GDB will be used, but will be removed in a future release.")
+ print("WARNING: --no-lldb was used but GDB is no longer supported.")
+ print("GDB will be used, but will be removed in the next release.")
if device is None:
error("Could not find a unique connected device/emulator.")
