openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

Merge "Rename emma coverage files" am: f7e06ef 

am: dbad7c2

* commit 'dbad7c237cf04f799d680e7e9920848a17ff4f5c':
  Rename emma coverage files

Change-Id: Id35b2972bd208391c5f6cfd4490437ca7e119052
This commit is contained in:
Sebastien Hertz 2016-03-29 07:26:19 +00:00 committed by android-build-merger
parent ce49c77515 dbad7c237c
commit eff5d9d0e1
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/host_java_library.mk
View File

@ -84,7 +84,7 @@ $(full_classes_jarjar_jar): $(full_classes_compiled_jar) | $(ACP)
endif endif
ifeq (true,$(LOCAL_EMMA_INSTRUMENT)) 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) $(full_classes_emma_jar): PRIVATE_EMMA_INTERMEDIATES_DIR := $(emma_intermediates_dir)
ifdef LOCAL_EMMA_COVERAGE_FILTER ifdef LOCAL_EMMA_COVERAGE_FILTER
$(full_classes_emma_jar): PRIVATE_EMMA_COVERAGE_FILTER := $(LOCAL_EMMA_COVERAGE_FILTER) $(full_classes_emma_jar): PRIVATE_EMMA_COVERAGE_FILTER := $(LOCAL_EMMA_COVERAGE_FILTER)

2
core/java.mk
View File

@ -452,7 +452,7 @@ $(full_classes_jarjar_jar): $(full_classes_compiled_jar) | $(ACP)
endif endif
ifeq ($(LOCAL_EMMA_INSTRUMENT),true) 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) $(full_classes_emma_jar): PRIVATE_EMMA_INTERMEDIATES_DIR := $(emma_intermediates_dir)
# module level coverage filter can be defined using LOCAL_EMMA_COVERAGE_FILTER # module level coverage filter can be defined using LOCAL_EMMA_COVERAGE_FILTER
# in Android.mk # in Android.mk