Support to build emmap_mata.zip in unbundled builds.
Bug: 6987838
Change-Id: Id6c81b08c4859442b7d52054ed5f278575719d1a
diff --git a/core/Makefile b/core/Makefile
index 2a214c6..4dde9f4 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -1287,12 +1287,16 @@
# A zip of emma code coverage meta files. Generated for fully emma
# instrumented build.
#
+ifeq (true,$(EMMA_INSTRUMENT))
EMMA_META_ZIP := $(PRODUCT_OUT)/emma_meta.zip
-$(EMMA_META_ZIP): $(INSTALLED_SYSTEMIMAGE)
+# the dependency will be set up later in build/core/main.mk.
+$(EMMA_META_ZIP) :
@echo "Collecting Emma coverage meta files."
$(hide) find $(TARGET_COMMON_OUT_ROOT) -name "coverage.em" | \
zip -@ -q $@
+endif # EMMA_INSTRUMENT=true
+
# -----------------------------------------------------------------
# dalvik something
.PHONY: dalvikfiles