tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Remove module jacocoagent from TARGET_CORE_JARS." am: 10954b52ee

Browse source 
am: 8262feccd9

Change-Id: I8c68f1db656aee6fc7942ccd696f6f25e3bdf242
This commit is contained in:
Roland Levillain 2019-10-30 04:33:23 -07:00 committed by android-build-merger
commit e4516b7406
2 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
core/envsetup.mk
View file

@ -259,14 +259,6 @@ endef
# Java libraries in the ART apex build rule.
ART_APEX_JARS := core-oj core-libart core-icu4j okhttp bouncycastle apache-xml
TARGET_CORE_JARS := $(ART_APEX_JARS) conscrypt
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))
#################################################################

12
core/product_config.mk
View file

@ -184,6 +184,18 @@ current_product_makefile :=
all_product_makefiles :=
all_product_configs :=
# Jacoco agent JARS to be built and installed, if any.
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.
$(foreach product,$(PRODUCTS),\
$(eval PRODUCTS.$(product).PRODUCT_PACKAGES += jacocoagent)\
$(eval PRODUCTS.$(product).PRODUCT_BOOT_JARS += jacocoagent))
endif # EMMA_INSTRUMENT_STATIC
endif # EMMA_INSTRUMENT
############################################################################
# Strip and assign the PRODUCT_ variables.
$(call strip-product-vars)