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

Merge "Only add jacocoagent if the package contains some java code." into nyc-dev

Browse Source
This commit is contained in:
Allen Hair
2016-03-29 21:18:24 +00:00
committed by Android (Google) Code Review
parent 4aca571552 0f85562384
commit eda71810b8
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/package_internal.mk
View File

@@ -231,7 +231,10 @@ ifeq (true,$(LOCAL_EMMA_INSTRUMENT))
ifeq (true,$(EMMA_INSTRUMENT_STATIC)) ifeq (true,$(EMMA_INSTRUMENT_STATIC))
ifdef LOCAL_JACK_ENABLED ifdef LOCAL_JACK_ENABLED
# Jack supports coverage with Jacoco # Jack supports coverage with Jacoco
ifneq ($(LOCAL_SRC_FILES)$(LOCAL_STATIC_JAVA_LIBRARIES)$(LOCAL_SOURCE_FILES_ALL_GENERATED),)
# Only add jacocoagent if the package contains some java code
LOCAL_STATIC_JAVA_LIBRARIES += jacocoagent LOCAL_STATIC_JAVA_LIBRARIES += jacocoagent
endif # Contains java code
else else
LOCAL_STATIC_JAVA_LIBRARIES += emma LOCAL_STATIC_JAVA_LIBRARIES += emma
endif # LOCAL_JACK_ENABLED endif # LOCAL_JACK_ENABLED
@@ -241,7 +244,10 @@ ifdef TARGET_BUILD_APPS
# In unbundled build merge the emma library into the apk. # In unbundled build merge the emma library into the apk.
ifdef LOCAL_JACK_ENABLED ifdef LOCAL_JACK_ENABLED
# Jack supports coverage with Jacoco # Jack supports coverage with Jacoco
ifneq ($(LOCAL_SRC_FILES)$(LOCAL_STATIC_JAVA_LIBRARIES)$(LOCAL_SOURCE_FILES_ALL_GENERATED),)
# Only add jacocoagent if the package contains some java code
LOCAL_STATIC_JAVA_LIBRARIES += jacocoagent LOCAL_STATIC_JAVA_LIBRARIES += jacocoagent
endif # Contains java code
else else
LOCAL_STATIC_JAVA_LIBRARIES += emma LOCAL_STATIC_JAVA_LIBRARIES += emma
endif # LOCAL_JACK_ENABLED endif # LOCAL_JACK_ENABLED