From ca96e25c5b21947fef1f500cc9b12d327aa161a8 Mon Sep 17 00:00:00 2001
From: Allen Hair <allenhair@google.com>
Date: Mon, 27 Jun 2016 12:32:50 -0700
Subject: [PATCH] DO NOT MERGE Skip emma instrumentation if we're using jack.

Bug: 29777843
Change-Id: I09071ef08e0b2fe64a78cfd6d81c73aa9b80967f
---
 core/java.mk | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/core/java.mk b/core/java.mk
index bc8ed645b4..2602daf53a 100644
--- a/core/java.mk
+++ b/core/java.mk
@@ -459,6 +459,8 @@ $(full_classes_jarjar_jar): $(full_classes_compiled_jar) | $(ACP)
 	$(hide) $(ACP) -fp $< $@
 endif
 
+full_classes_jar_source := $(full_classes_jarjar_jar)
+ifndef LOCAL_JACK_ENABLED
 ifeq ($(LOCAL_EMMA_INSTRUMENT),true)
 $(full_classes_emma_jar): PRIVATE_EMMA_COVERAGE_FILE := $(intermediates.COMMON)/coverage.emma.ignore
 $(full_classes_emma_jar): PRIVATE_EMMA_INTERMEDIATES_DIR := $(emma_intermediates_dir)
@@ -475,15 +477,12 @@ endif
 # $(full_classes_emma_jar)
 $(full_classes_emma_jar): $(full_classes_jarjar_jar) | $(EMMA_JAR)
 	$(transform-classes.jar-to-emma)
-
-else
-$(full_classes_emma_jar): $(full_classes_jarjar_jar) | $(ACP)
-	@echo Copying: $@
-	$(copy-file-to-target)
+full_classes_jar_source := $(full_classes_emma_jar)
+endif
 endif
 
 # Keep a copy of the jar just before proguard processing.
-$(full_classes_jar): $(full_classes_emma_jar) | $(ACP)
+$(full_classes_jar): $(full_classes_jar_source) | $(ACP)
 	@echo Copying: $@
 	$(hide) $(ACP) -fp $< $@