Merge "Replace libc++.so.1 with libc++.so" into main am: 9ec80322d6
Original change: https://android-review.googlesource.com/c/platform/build/+/2624306 Change-Id: I010d21a67e6103c8a1bd16da0ee5a19c86131c6a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -6781,7 +6781,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
|
||||
|
||||
|
Reference in New Issue
Block a user