Commit 088f9073 authored Feb 18, 2021 by Martin Stjernholm Committed by Automerger Merge Worker Feb 18, 2021

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia29703784a982ee46f695e49f2e9f65205b7847a

core/envsetup.mk

+4 −0

Original line number	Diff line number	Diff line
		@@ -301,6 +301,10 @@ ART_APEX_JARS := \
		com.android.art:okhttp \
		com.android.art:bouncycastle \
		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