Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 56c6f998 authored by Yabin Cui's avatar Yabin Cui Committed by Automerger Merge Worker
Browse files

Merge "Replace libc++.so.1 with libc++.so" into main am: 9ec80322 am:... 

Merge "Replace libc++.so.1 with libc++.so" into main am: 9ec80322 am: e9c4b394 am: 41b77aa0 am: 8c766aeb am: abd2aae6 am: 12f52d72

Original change: https://android-review.googlesource.com/c/platform/build/+/2624306



Change-Id: I11b9c8aaebe0b8a857131ac08f554eccd03f5359
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 12d54fd0 12f52d72

core/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -6784,7 +6784,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