Merge "Merge cherrypicks of [2137996, 2137997, 2137998, 2137999, 2138172] into ndk-r25-release." into ndk-r25-release
diff --git a/docs/changelogs/Changelog-r25.md b/docs/changelogs/Changelog-r25.md
index 5da7c38..2267868 100644
--- a/docs/changelogs/Changelog-r25.md
+++ b/docs/changelogs/Changelog-r25.md
@@ -13,8 +13,10 @@
## Changes
-* Includes Android 13 Beta 2 APIs.
+* Includes Android 13 APIs.
* Updated LLVM to clang-r450784d, based on LLVM 14 development.
+ * [Issue 1455]: Improved display of Android API levels in Clang diagnostics.
+ * [Issue 1710]: Fixed compiler crash caused by invalid `-march` values.
* Eliminate duplicate static libraries in API-versioned sysroot directories.
This reduces the uncompressed size of the NDK by 500 MB.
* Strip some binaries and libraries. This reduces the uncompressed size of
@@ -34,8 +36,10 @@
[Issue 933]: https://github.com/android/ndk/issues/933
[Issue 1334]: https://github.com/android/ndk/issues/1334
+[Issue 1455]: https://github.com/android/ndk/issues/1455
[Issue 1634]: https://github.com/android/ndk/issues/1634
[Issue 1693]: https://github.com/android/ndk/issues/1693
+[Issue 1710]: https://github.com/android/ndk/issues/1710
[Issue 1717]: https://github.com/android/ndk/issues/1717
## Known Issues
diff --git a/ndk/config.py b/ndk/config.py
index 32289f4..43c04e4 100644
--- a/ndk/config.py
+++ b/ndk/config.py
@@ -6,7 +6,7 @@
hotfix_str = chr(ord("a") + hotfix) if hotfix else ""
beta = 0
beta_str = "-beta{}".format(beta) if beta > 0 else ""
-canary = True
+canary = False
canary_str = "-canary" if canary else ""
release = "r{}{}{}{}".format(major, hotfix_str, beta_str, canary_str)
if __name__ == "__main__":
diff --git a/tests/build/gc_sections/test_config.py b/tests/build/gc_sections/test_config.py
deleted file mode 100644
index 9c00146..0000000
--- a/tests/build/gc_sections/test_config.py
+++ /dev/null
@@ -1,7 +0,0 @@
-from typing import Optional
-
-from ndk.test.buildtest.case import Test
-
-
-def build_broken(test: Test) -> tuple[Optional[str], Optional[str]]:
- return "all", "https://github.com/android/ndk/issues/1717"
