Update LLVM to r433403.

Test: checkbuild.py && run_tests.py Bug: android/ndk#1590 Change-Id: I24982853d8b9a9c3c79905a4cc73699a6f46a5ef
android-la64 · Sep 29, 2021 · 2b1d33e · 2b1d33e
1 parent c0d67a5
commit 2b1d33e
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/build/tools/make_standalone_toolchain.py b/build/tools/make_standalone_toolchain.py
@@ -108,7 +108,8 @@ def make_clang_scripts(install_dir, arch, api, windows):
     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
@@ -32,6 +32,11 @@ For Android Studio issues, follow the docs on the [Android Studio site].
 
 ## 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
@@ -22,7 +22,7 @@
 import ndk.paths
 
 
-CLANG_VERSION = 'clang-r416183c1'
+CLANG_VERSION = 'clang-r433403'
 
 
 HOST_TRIPLE_MAP = {