Merge "Delete libc++.a and libc++abi.a on macOS."
diff --git a/build/tools/make_standalone_toolchain.py b/build/tools/make_standalone_toolchain.py
index 8a121e9..6d68ae0 100755
--- a/build/tools/make_standalone_toolchain.py
+++ b/build/tools/make_standalone_toolchain.py
@@ -108,7 +108,8 @@
preset.
"""
with open(os.path.join(install_dir, 'AndroidVersion.txt')) as version_file:
- major, minor, _build = version_file.read().strip().split('.')
+ first_line = version_file.read().strip().splitlines()[0]
+ major, minor, _build = first_line.split('.')
version_number = major + minor
diff --git a/docs/changelogs/Changelog-r24.md b/docs/changelogs/Changelog-r24.md
index 72dce88..387f5ca 100644
--- a/docs/changelogs/Changelog-r24.md
+++ b/docs/changelogs/Changelog-r24.md
@@ -32,6 +32,11 @@
## Changes
+* Updated LLVM to clang-r433403, based on LLVM 13 development.
+ * [Issue 1590]: Fix LLDB help crash.
+
+[Issue 1590]: https://github.com/android/ndk/issues/1590
+
## Known Issues
This is not intended to be a comprehensive list of all outstanding bugs.
diff --git a/ndk/toolchains.py b/ndk/toolchains.py
index d5ea189..e4a3ead 100644
--- a/ndk/toolchains.py
+++ b/ndk/toolchains.py
@@ -22,7 +22,7 @@
import ndk.paths
-CLANG_VERSION = 'clang-r416183c1'
+CLANG_VERSION = 'clang-r433403'
HOST_TRIPLE_MAP = {
