Include jacoco in core-libart for full coverage build
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
diff --git a/JavaLibrary.mk b/JavaLibrary.mk
index 591afb0..f5ed508 100644
--- a/JavaLibrary.mk
+++ b/JavaLibrary.mk
@@ -121,6 +121,12 @@
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)