From 491c9ce48add521e7c0cdbe1c1fa7ea392b775a5 Mon Sep 17 00:00:00 2001
From: Sebastien Hertz <shertz@google.com>
Date: Fri, 25 Mar 2016 17:11:38 +0100
Subject: [PATCH] Rename emma coverage files

We no longer use emma with Jack. However, during the process of a
full build, we may run the emma task and overwrite the coverage file
generated by Jack with the one from emma because they use the same
filename.

This CL renames coverage files generated by emma so they no longer
break those created by Jack.

Bug: 27822188
Change-Id: Ie3fdc2b8f53deafbefbd6973e39f29d8c46f371e
---
 core/host_java_library.mk | 2 +-
 core/java.mk              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/host_java_library.mk b/core/host_java_library.mk
index b5c5e9eea..c91fdc116 100644
--- a/core/host_java_library.mk
+++ b/core/host_java_library.mk
@@ -84,7 +84,7 @@ $(full_classes_jarjar_jar): $(full_classes_compiled_jar) | $(ACP)
 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)
diff --git a/core/java.mk b/core/java.mk
index 811f7ca41..74e58751c 100644
--- a/core/java.mk
+++ b/core/java.mk
@@ -448,7 +448,7 @@ $(full_classes_jarjar_jar): $(full_classes_compiled_jar) | $(ACP)
 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