diff options
| author | Allen Hair <allenhair@google.com> | 2016-06-28 17:45:17 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-06-28 17:45:17 +0000 |
| commit | 1f44c26b1eb46503de995735d093e00d8ff9d712 (patch) | |
| tree | 52eebbd9f4189d30cfe6dc050dc15f1d92774e42 | |
| parent | 18ecea398657844157cc194213eb5bede2157ee9 (diff) | |
| parent | ca96e25c5b21947fef1f500cc9b12d327aa161a8 (diff) | |
| download | build-1f44c26b1eb46503de995735d093e00d8ff9d712.tar.gz | |
Merge "DO NOT MERGE Skip emma instrumentation if we're using jack." into nyc-dev
| -rw-r--r-- | core/java.mk | 11 |
1 files 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 $< $@ |