From 1b19a4956e8e322b0f5b0a67208c60caad9c7191 Mon Sep 17 00:00:00 2001
From: Pirama Arumuga Nainar <pirama@google.com>
Date: Tue, 23 Nov 2021 15:15:20 -0800
Subject: [PATCH 1/2] Switch clang-tools build to clang-r437112

Bug: http://b/150809112
Bug: http://b/201432564

Test: prebuilts/clang-tools/build-prebuilts.sh
Change-Id: If75ab1d554a7926c96144be66a85208e76ded8c3
---
 vndk/tools/header-checker/android/envsetup.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/vndk/tools/header-checker/android/envsetup.sh b/vndk/tools/header-checker/android/envsetup.sh
index 1ef95c52c..88fd40767 100644
--- a/vndk/tools/header-checker/android/envsetup.sh
+++ b/vndk/tools/header-checker/android/envsetup.sh
@@ -15,5 +15,5 @@
 # limitations under the License.
 
 export LLVM_BUILD_HOST_TOOLS=true
-export LLVM_PREBUILTS_VERSION=clang-r433403
-export LLVM_RELEASE_VERSION=13.0.2
+export LLVM_PREBUILTS_VERSION=clang-r437112
+export LLVM_RELEASE_VERSION=14.0.0

From f5fae5fcab1c242e5538a0cc3bba3c0c868e1107 Mon Sep 17 00:00:00 2001
From: Pirama Arumuga Nainar <pirama@google.com>
Date: Tue, 23 Nov 2021 15:17:37 -0800
Subject: [PATCH 2/2] Use libclang-cpp for header-* tools and tests

Bug: http://b/150809112

This is a new upstream library that exports both the clang and LLVM C++
symbols and can replace libLLVM and (android-toolchain-only)
libclang_cxx.so.

Test: Build and run header-* tools
Change-Id: Ibb8ae24e758c4c492c18e1192be9d57ef05b78df
---
 vndk/tools/header-checker/Android.bp | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/vndk/tools/header-checker/Android.bp b/vndk/tools/header-checker/Android.bp
index 628e64f6d..7d8c3ca18 100644
--- a/vndk/tools/header-checker/Android.bp
+++ b/vndk/tools/header-checker/Android.bp
@@ -79,8 +79,7 @@ cc_binary_host {
 
     shared_libs: [
         "libprotobuf-cpp-full",
-        "libLLVM_host",
-        "libclang_cxx_host",
+        "libclang-cpp_host",
         "libc++_host",
     ],
 }
@@ -98,8 +97,7 @@ cc_defaults {
 
     shared_libs: [
         "libprotobuf-cpp-full",
-        "libLLVM_host",
-        "libclang_cxx_host",
+        "libclang-cpp_host",
         "libc++_host",
     ],
 }
@@ -169,7 +167,7 @@ cc_library_host_static {
     ],
 
     shared_libs: [
-        "libLLVM_host",
+        "libclang-cpp_host",
         "libc++_host",
         "libprotobuf-cpp-full",
     ],
@@ -204,7 +202,7 @@ cc_test_host {
     ],
 
     shared_libs: [
-        "libLLVM_host",
+        "libclang-cpp_host",
         "libc++_host",
     ],