Merge "Replace libc++.so.1 with libc++.so" into main
This commit is contained in:
@@ -6781,7 +6781,7 @@ SYSTEM_NOTICE_DEPS += $(COVERAGE_ZIP)
|
|||||||
ifeq (true,$(CLANG_COVERAGE))
|
ifeq (true,$(CLANG_COVERAGE))
|
||||||
LLVM_PROFDATA := $(LLVM_PREBUILTS_BASE)/linux-x86/$(LLVM_PREBUILTS_VERSION)/bin/llvm-profdata
|
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
|
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.
|
# Use llvm-profdata.zip for backwards compatibility with tradefed code.
|
||||||
LLVM_COVERAGE_TOOLS_ZIP := $(PRODUCT_OUT)/llvm-profdata.zip
|
LLVM_COVERAGE_TOOLS_ZIP := $(PRODUCT_OUT)/llvm-profdata.zip
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user