StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Package llvm-cov in llvm-profdata.zip (take 2)" am: 423e117fa2 am: 5dc3d4f43b

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/+/2024705

Change-Id: If873fe7ba219712967b3ee6162c3b75ed59f2d1e
This commit is contained in:
Treehugger Robot
2022-03-15 22:42:04 +00:00
committed by Automerger Merge Worker
parent 6a555d8cc7 5dc3d4f43b
commit b815c86cd6
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/Makefile
View File

@@ -5913,12 +5913,15 @@ $(COVERAGE_ZIP): $(SOONG_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)/lib64/libc++.so.1
PROFDATA_ZIP := $(PRODUCT_OUT)/llvm-profdata.zip
$(PROFDATA_ZIP): $(SOONG_ZIP)
$(hide) $(SOONG_ZIP) -d -o $@ -C $(LLVM_PREBUILTS_BASE)/linux-x86/$(LLVM_PREBUILTS_VERSION) -f $(LLVM_PROFDATA) -f $(LIBCXX)
# Use llvm-profdata.zip for backwards compatibility with tradefed code.
LLVM_COVERAGE_TOOLS_ZIP := $(PRODUCT_OUT)/llvm-profdata.zip
$(call dist-for-goals,droidcore-unbundled apps_only,$(PROFDATA_ZIP))
$(LLVM_COVERAGE_TOOLS_ZIP): $(SOONG_ZIP)
$(hide) $(SOONG_ZIP) -d -o $@ -C $(LLVM_PREBUILTS_BASE)/linux-x86/$(LLVM_PREBUILTS_VERSION) -f $(LLVM_PROFDATA) -f $(LIBCXX) -f $(LLVM_COV)
$(call dist-for-goals,droidcore-unbundled apps_only,$(LLVM_COVERAGE_TOOLS_ZIP))
endif
# -----------------------------------------------------------------