commit e91ab2397f353c53edb2a3cb6ac2c2f1bbe5462c
author Oliver Nguyen <olivernguyen@google.com> Tue Apr 30 15:14:44 2019 -0700
committer Oliver Nguyen <olivernguyen@google.com> Mon Jun 10 15:27:31 2019 -0700
tree d1bccb784f4a8ba3d49908bfe032bcd9d16e0f3d
parent 5f4f4256ebb17ffdea5ed6fad32f2bc6049a7b5a

Package coverage files as a zip.

Test: make NATIVE_COVERAGE=true COVERAGE_PATHS="*"
Change-Id: I7ee9253ef47a502a9d29f7e15a4402cbb90e34ae

core/definitions.mk

diff --git a/core/definitions.mk b/core/definitions.mk
index 5d3227a..512bbc4 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -1838,6 +1838,16 @@
 $(transform-host-o-to-executable-inner)
 endef
 
+###########################################################
+## Commands for packaging native coverage files
+###########################################################
+define package-coverage-files
+  @rm -f $@ $@.lst $@.premerged
+  @touch $@.lst
+  $(foreach obj,$(strip $(PRIVATE_ALL_OBJECTS)), $(hide) echo $(obj) >> $@.lst$(newline))
+  $(hide) $(SOONG_ZIP) -o $@.premerged -C $(OUT_DIR) -l $@.lst
+  $(hide) $(MERGE_ZIPS) -ignore-duplicates $@ $@.premerged $(strip $(PRIVATE_ALL_WHOLE_STATIC_LIBRARIES))
+endef
 
 ###########################################################
 ## Commands for running javac to make .class files