From 6ec1f057dcd98325bd2d2f1a3a137e402c393798 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.

Keep coverage.em file name for host rules where Jack is not called.

Bug: 27822188

(cherry picked from commit 491c9ce48add521e7c0cdbe1c1fa7ea392b775a5
&& commit 8f0e52c3a66b4c493f0d133e00591ae7d376eb49)

Change-Id: I26beee5a8d42a2ef1d476661e4b591fb09f1276f
---
 core/java.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/java.mk b/core/java.mk
index 64140fb32..760d1e18b 100644
--- a/core/java.mk
+++ b/core/java.mk
@@ -456,7 +456,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
-- 
2.11.0