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

Merge "Revert "Package llvm-cov in llvm-profdata.zip"" am: 1b8a1490a9

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

Change-Id: Idfde9842ae228863c926d7c5a38982e9f0f473d5
This commit is contained in:
James Chen
2022-03-15 05:36:44 +00:00
committed by Automerger Merge Worker
parent ef8eb14d88 1b8a1490a9
commit fe9c063243
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/Makefile
View File

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