From f5fae5fcab1c242e5538a0cc3bba3c0c868e1107 Mon Sep 17 00:00:00 2001 From: Pirama Arumuga Nainar Date: Tue, 23 Nov 2021 15:17:37 -0800 Subject: [PATCH] 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", ],