p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge "Enable SKIP_BOOT_JARS_CHECK by default when instrumenting" 

am: 5313503663

Change-Id: Iefc4b4cecb6f22b39ec66675fffe65ac62a18e79
This commit is contained in:
Jeff Gaston 2017-12-06 21:37:10 +00:00 committed by android-build-merger
parent a363f249e9 5313503663
commit a659799786
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
core/main.mk
View File

@ -97,11 +97,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.