commit ccf5111f4a3c64776912199014c900ccd12661dd
author James Chen <jamesyhchen@google.com> Tue Mar 15 02:13:40 2022 +0000
committer James Chen <jamesyhchen@google.com> Tue Mar 15 02:13:40 2022 +0000
tree 20668f0d91e922c52b30e139bf68695b45fe1a27
parent bd4f7c7ce79af2f97d88be4e161929bab016d981

Revert "Package llvm-cov in llvm-profdata.zip"

This reverts commit bd4f7c7ce79af2f97d88be4e161929bab016d981.

Reason for revert: b/224640947

Change-Id: I0eee5e9b75ac39513e43448c3bb63f18545cbc49

core/Makefile

diff --git a/core/Makefile b/core/Makefile
index 0e01828..b8fdf45 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -5902,15 +5902,12 @@
 #
 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
 
 # -----------------------------------------------------------------