Merge "Include jacoco in core-libart for full coverage build"

DC-fgervais · Apr 6, 2016 · efb7278 · efb7278
2 parents 5b21edd + 827e3d4
commit efb7278
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/JavaLibrary.mk b/JavaLibrary.mk
@@ -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)