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

2021-02-18 07:52:09 +00:00 · 2021-02-18 07:52:09 +00:00 · 714c4bceb3
parent 9f9236ec56 fa83228660
commit 714c4bceb3
1 changed files with 4 additions and 0 deletions
--- a/core/envsetup.mk
+++ b/core/envsetup.mk
@ -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