From f1b88bb0a9911395989208c07fe33c1e8f8179f7 Mon Sep 17 00:00:00 2001 From: Yabin Cui Date: Tue, 13 Jun 2023 21:55:38 +0000 Subject: [PATCH] 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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/Makefile b/core/Makefile index 1814f984d0..2ed7fcaa41 100644 --- a/core/Makefile +++ b/core/Makefile @@ -6763,7 +6763,7 @@ SYSTEM_NOTICE_DEPS += $(COVERAGE_ZIP) 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