StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Enable SKIP_BOOT_JARS_CHECK by default when instrumenting" am: 5313503663 am: a659799786

Browse Source 
am: c0715eb231

Change-Id: I5dd7a5d83dc085c7f2756b76ca409c99e9cca5f0
This commit is contained in:
Jeff Gaston
2017-12-06 22:21:38 +00:00
committed by android-build-merger
parent c84418f66d c0715eb231
commit 2936701ffe
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/main.mk
View File

@@ -99,11 +99,21 @@ clean-dex-files:
# (must be defined before including definitions.make) # (must be defined before including definitions.make)
INTERNAL_MODIFIER_TARGETS := all INTERNAL_MODIFIER_TARGETS := all
# EMMA_INSTRUMENT_STATIC merges the static emma library to each emma-enabled module. # EMMA_INSTRUMENT_STATIC merges the static jacoco library to each
# jacoco-enabled module.
ifeq (true,$(EMMA_INSTRUMENT_STATIC)) ifeq (true,$(EMMA_INSTRUMENT_STATIC))
EMMA_INSTRUMENT := true EMMA_INSTRUMENT := true
endif endif
ifeq (true,$(EMMA_INSTRUMENT))
# Adding the jacoco library can cause the inclusion of
# some typically banned classes
# So if the user didn't specify SKIP_BOOT_JARS_CHECK, enable it here
ifndef SKIP_BOOT_JARS_CHECK
SKIP_BOOT_JARS_CHECK := true
endif
endif
# #
# ----------------------------------------------------------------- # -----------------------------------------------------------------
# Validate ADDITIONAL_DEFAULT_PROPERTIES. # Validate ADDITIONAL_DEFAULT_PROPERTIES.