commit f1b88bb0a9911395989208c07fe33c1e8f8179f7
author Yabin Cui <yabinc@google.com> Tue Jun 13 21:55:38 2023 +0000
committer Yabin Cui <yabinc@google.com> Tue Jun 13 21:55:38 2023 +0000
tree e5a90026617c0c22409910819daec8bc5ad8152f
parent 0fd965132165b9fd29becd6856fcd7b8194e8f27

Replace libc++.so.1 with libc++.so

After clang update (with aosp/2590665), clang prebuilts now depend on libc++.so
instead of libc++.so.1.

Bug: 287115146
Test: presubmit
Change-Id: If2fc9411e7eb5542896f3cdce9adea786451ddbc

core/Makefile

diff --git a/core/Makefile b/core/Makefile
index 1814f98..2ed7fca 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -6763,7 +6763,7 @@
 ifeq (true,$(CLANG_COVERAGE))
   LLVM_PROFDATA := $(LLVM_PREBUILTS_BASE)/linux-x86/$(LLVM_PREBUILTS_VERSION)/bin/llvm-profdata
   LLVM_COV := $(LLVM_PREBUILTS_BASE)/linux-x86/$(LLVM_PREBUILTS_VERSION)/bin/llvm-cov
-  LIBCXX := $(LLVM_PREBUILTS_BASE)/linux-x86/$(LLVM_PREBUILTS_VERSION)/lib/x86_64-unknown-linux-gnu/libc++.so.1
+  LIBCXX := $(LLVM_PREBUILTS_BASE)/linux-x86/$(LLVM_PREBUILTS_VERSION)/lib/x86_64-unknown-linux-gnu/libc++.so
   # Use llvm-profdata.zip for backwards compatibility with tradefed code.
   LLVM_COVERAGE_TOOLS_ZIP := $(PRODUCT_OUT)/llvm-profdata.zip