StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename emma coverage files

Browse Source 
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 491c9ce48a
&& commit 8f0e52c3a6)

Change-Id: I26beee5a8d42a2ef1d476661e4b591fb09f1276f
This commit is contained in:
Sebastien Hertz
2016-03-25 17:11:38 +01:00
parent f9d685008d
commit 6ec1f057dc
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java.mk
View File

@@ -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