Skip to content

Commit

Permalink
Include jacoco in core-libart for full coverage build
Browse files Browse the repository at this point in the history
When building with EMMA_INSTRUMENT=true, coverage classes must be
available everywhere (so all apps can run with code coverage without
including those classes).

This CL includes jacoco into core-libart so it's available in the
bootclasspath (only when EMMA_INSTRUMENT=true).

Bug: 27607712
Change-Id: Ib7fe6448d7105b10db329e6563fe9d92eb8817b4
  • Loading branch information
Sebastien Hertz committed Apr 5, 2016
1 parent 20f6ae8 commit 827e3d4
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions JavaLibrary.mk
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,12 @@ LOCAL_JAVA_LANGUAGE_VERSION := 1.8
LOCAL_MODULE := core-libart
LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/JavaLibrary.mk
LOCAL_JAVA_LIBRARIES := core-all
ifeq ($(EMMA_INSTRUMENT),true)
ifneq ($(EMMA_INSTRUMENT_STATIC),true)
# For instrumented build, include Jacoco classes into core-libart.
LOCAL_STATIC_JAVA_LIBRARIES := jacocoagent
endif # EMMA_INSTRUMENT_STATIC
endif # EMMA_INSTRUMENT
LOCAL_CORE_LIBRARY := true
LOCAL_REQUIRED_MODULES := tzdata
include $(BUILD_JAVA_LIBRARY)
Expand Down

0 comments on commit 827e3d4

Please sign in to comment.