commit 301d5955dabf12b6b0e0610cae5f87231f0dc1f1
author Sebastien Hertz <shertz@google.com> Thu Mar 31 06:58:30 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Mar 31 06:58:30 2016 +0000
tree e01b975d97d5cd43b7dabddfd5440caf868ebb7d
parent 8690de4302cb231668def658a1e3b1bfe30eacda
parent 6ec1f057dcd98325bd2d2f1a3a137e402c393798

Merge "Rename emma coverage files" into nyc-dev

core/java.mk

diff --git a/core/java.mk b/core/java.mk
index 64140fb..760d1e1 100644
--- a/core/java.mk
+++ b/core/java.mk
@@ -456,7 +456,7 @@
 endif
 
 ifeq ($(LOCAL_EMMA_INSTRUMENT),true)
-$(full_classes_emma_jar): PRIVATE_EMMA_COVERAGE_FILE := $(intermediates.COMMON)/coverage.em
+$(full_classes_emma_jar): PRIVATE_EMMA_COVERAGE_FILE := $(intermediates.COMMON)/coverage.emma.ignore
 $(full_classes_emma_jar): PRIVATE_EMMA_INTERMEDIATES_DIR := $(emma_intermediates_dir)
 # module level coverage filter can be defined using LOCAL_EMMA_COVERAGE_FILTER
 # in Android.mk