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

Commit 408b2921 authored by James Chen's avatar James Chen Committed by Automerger Merge Worker
Browse files

Merge "Revert "Package llvm-cov in llvm-profdata.zip"" am: 1b8a1490 am: fe9c0632 am: 9c185aae 

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

Change-Id: I3fd20f925dd4d4b8caf68961991ddf7f1cdb8472
parents a80c97f8 9c185aae

core/Makefile

+4 −7
Original line number Diff line number Diff line
@@ -5913,15 +5913,12 @@ $(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-profdata

  LIBCXX := $(LLVM_PREBUILTS_BASE)/linux-x86/$(LLVM_PREBUILTS_VERSION)/lib64/libc++.so.1

  # Use llvm-profdata.zip for backwards compatibility with tradefed code.

  LLVM_COVERAGE_TOOLS_ZIP := $(PRODUCT_OUT)/llvm-profdata.zip

  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)



  $(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))

  $(call dist-for-goals,droidcore-unbundled apps_only,$(PROFDATA_ZIP))

endif



# -----------------------------------------------------------------