Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a6af8ef9 authored by Colin Cross's avatar Colin Cross Committed by android-build-merger
Browse files

Merge "Move jacocoagent into the bootclasspath" 

am: 68dad73d

Change-Id: I67cda4a8aefee7cdb946e4e3181f3254a2994ebc
parents ed7dab76 68dad73d

core/envsetup.mk

+8 −0
Original line number Diff line number Diff line
@@ -200,6 +200,14 @@ TARGET_COPY_OUT_VENDOR := $(_vendor_path_placeholder) 
# Set up minimal BOOTCLASSPATH list of jars to build/execute

# java code with dalvikvm/art.

TARGET_CORE_JARS := core-oj core-libart conscrypt okhttp bouncycastle apache-xml

ifeq ($(EMMA_INSTRUMENT),true)

  ifneq ($(EMMA_INSTRUMENT_STATIC),true)

    # For instrumented build, if Jacoco is not being included statically

    # in instrumented packages then include Jacoco classes into the

    # bootclasspath.

    TARGET_CORE_JARS += jacocoagent

  endif # EMMA_INSTRUMENT_STATIC

endif # EMMA_INSTRUMENT

HOST_CORE_JARS := $(addsuffix -hostdex,$(TARGET_CORE_JARS))

#################################################################

core/java.mk

+13 −0
Original line number Diff line number Diff line
@@ -18,6 +18,19 @@ endif #PDK 
LOCAL_NO_STANDARD_LIBRARIES:=$(strip $(LOCAL_NO_STANDARD_LIBRARIES))

LOCAL_SDK_VERSION:=$(strip $(LOCAL_SDK_VERSION))



ifneq ($(LOCAL_MODULE),jacocoagent)

  ifneq ($(LOCAL_NO_STANDARD_LIBRARIES),true)

    ifeq ($(EMMA_INSTRUMENT),true)

      ifneq ($(EMMA_INSTRUMENT_STATIC),true)

        # For instrumented build, if Jacoco is not being included statically

        # in instrumented packages then include Jacoco classes into the

        # bootclasspath.

        LOCAL_JAVA_LIBRARIES := jacocoagent $(LOCAL_JAVA_LIBRARIES)

      endif # EMMA_INSTRUMENT_STATIC

    endif # EMMA_INSTRUMENT

  endif # !LOCAL_NO_STANDARD_LIBRARIES

endif # LOCAL_MODULE == jacocoagent



ifneq ($(LOCAL_SDK_VERSION),)

  ifeq ($(LOCAL_NO_STANDARD_LIBRARIES),true)

    $(error $(LOCAL_PATH): Must not define both LOCAL_NO_STANDARD_LIBRARIES and LOCAL_SDK_VERSION)