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

Commit a7c16ebf authored by Martin Stjernholm's avatar Martin Stjernholm Committed by Automerger Merge Worker
Browse files

Merge "Move the logic to add jacocoagent in instrumentation builds to make."... 

Merge "Move the logic to add jacocoagent in instrumentation builds to make." am: 714c4bce am: b496ee41 am: 088f9073

Original change: https://android-review.googlesource.com/c/platform/build/+/1592251

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icf18c51cd96a4f51e129f1c1be2ad368322f0c7e
parents 512457eb 088f9073

core/envsetup.mk

+4 −0
Original line number Original line Diff line number Diff line
@@ -301,6 +301,10 @@ ART_APEX_JARS := \ 
    com.android.art:okhttp \

    com.android.art:okhttp \

    com.android.art:bouncycastle \

    com.android.art:bouncycastle \

    com.android.art:apache-xml

    com.android.art:apache-xml

# With EMMA_INSTRUMENT_FRAMEWORK=true the Core libraries depend on jacoco.

ifeq (true,$(EMMA_INSTRUMENT_FRAMEWORK))

  ART_APEX_JARS += com.android.art:jacocoagent

endif

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

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





# Read the product specs so we can get TARGET_DEVICE and other

# Read the product specs so we can get TARGET_DEVICE and other