p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Only add jacocoagent if the package contains some java code. 

Bug: 27877982
Change-Id: I8bf05d67a823402e7e488990753cc9005ec5e90b
This commit is contained in:
Allen Hair 2016-03-28 12:52:37 -07:00
parent 8111146ea3
commit 0f85562384
1 changed files with 6 additions and 0 deletions
Show Stats 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