commit f7e06ef3b40da7931cee62210f880b7cb00787ce
author Sebastien Hertz <shertz@google.com> Tue Mar 29 07:17:12 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Mar 29 07:17:12 2016 +0000
tree 3e602455b158f86d2399e347df66008c406c4b2c
parent 8fe0fc90653bfd40634d946002fd0e12b59f1022
parent 491c9ce48add521e7c0cdbe1c1fa7ea392b775a5

Merge "Rename emma coverage files"

core/host_java_library.mk

diff --git a/core/host_java_library.mk b/core/host_java_library.mk
index 0d71c01..c1565ed 100644
--- a/core/host_java_library.mk
+++ b/core/host_java_library.mk
@@ -84,7 +84,7 @@
 endif
 
 ifeq (true,$(LOCAL_EMMA_INSTRUMENT))
-$(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)
 ifdef LOCAL_EMMA_COVERAGE_FILTER
 $(full_classes_emma_jar): PRIVATE_EMMA_COVERAGE_FILTER := $(LOCAL_EMMA_COVERAGE_FILTER)

core/java.mk

diff --git a/core/java.mk b/core/java.mk
index 6fb16ea..1a3fba6 100644
--- a/core/java.mk
+++ b/core/java.mk
@@ -444,7 +444,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