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

Merge "Fix code coverage for apps" am: 2e8a1fc am: 274a5a5 

am: 25f94a7

* commit '25f94a74fb8e8bd9e4174150614560114ac01cce':
  Fix code coverage for apps

Change-Id: I4f0d64e4b64c2da06e3a7cd1238c3a84cae89282
This commit is contained in:
Sebastien Hertz 2016-04-05 09:30:15 +00:00 committed by android-build-merger
parent 4ec03cf8ee 25f94a74fb
commit acec92938f
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
core/package_internal.mk
View File

@ -234,8 +234,21 @@ LOCAL_STATIC_JAVA_LIBRARIES += jacocoagent
else # ! EMMA_INSTRUMENT_STATIC else # ! EMMA_INSTRUMENT_STATIC
ifdef LOCAL_SDK_VERSION ifdef LOCAL_SDK_VERSION
ifdef TARGET_BUILD_APPS ifdef TARGET_BUILD_APPS
# In unbundled build, merge the coverage library into the apk.
# Jack supports coverage with Jacoco # Jack supports coverage with Jacoco
LOCAL_STATIC_JAVA_LIBRARIES += jacocoagent LOCAL_STATIC_JAVA_LIBRARIES += jacocoagent
# Exclude jacoco classes from proguard
LOCAL_PROGUARD_FLAGS += -include $(BUILD_SYSTEM)/proguard.jacoco.flags
LOCAL_JACK_PROGUARD_FLAGS += -include $(BUILD_SYSTEM)/proguard.jacoco.flags
else # ! TARGET_BUILD_APPS
# If build against the SDK in full build, core.jar is not used
# so coverage classes are not present.
# Jack needs jacoco on the classpath but we do not want it to be in
# the final apk. While it is a static library, we add it to the
# LOCAL_JAVA_LIBRARIES which are only present on the classpath.
# Note: we have nothing to do for proguard since jacoco will be
# on the classpath only, thus not modified during the compilation.
LOCAL_JAVA_LIBRARIES += jacocoagent
endif # TARGET_BUILD_APPS endif # TARGET_BUILD_APPS
endif # LOCAL_SDK_VERSION endif # LOCAL_SDK_VERSION
endif # ! EMMA_INSTRUMENT_STATIC endif # ! EMMA_INSTRUMENT_STATIC