aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Gampe <agampe@google.com>2017-11-22 14:08:22 -0800
committerAndreas Gampe <agampe@google.com>2017-11-22 14:16:24 -0800
commit5ccf0900d0d0c568a5c58ab9ffd9e6349e845c52 (patch)
tree2ed14d042649049b3a2514a1ebf98583bc49af69
parent520c9f0f5fffbc135e21c0b4c33ef279dca4ee9c (diff)
downloadbuild-5ccf0900d0d0c568a5c58ab9ffd9e6349e845c52.tar.gz
Build: Make dex2oat boot image error abort explicit
Add explicit arguments that will abort boot image compilation when a class is found that fails compile-time verification. This allows certain configurations to disable these checks. WARNING: Disabling the checks is highly discouraged. Bug: 69106371 Test: m Change-Id: I63e915005fcda588b223ec60ef8c9db28d42e577
-rw-r--r--core/dex_preopt_libart_boot.mk2
1 files changed, 2 insertions, 0 deletions
diff --git a/core/dex_preopt_libart_boot.mk b/core/dex_preopt_libart_boot.mk
index 302cc8b963..8b71198fb6 100644
--- a/core/dex_preopt_libart_boot.mk
+++ b/core/dex_preopt_libart_boot.mk
@@ -97,6 +97,8 @@ $($(my_2nd_arch_prefix)DEFAULT_DEX_PREOPT_BUILT_IMAGE_FILENAME) : $(LIBART_TARGE
--runtime-arg -Xnorelocate --compile-pic \
--no-generate-debug-info --generate-build-id \
--multi-image --no-inline-from=core-oj.jar \
+ --abort-on-hard-verifier-error \
+ --abort-on-soft-verifier-error \
$(PRODUCT_DEX_PREOPT_BOOT_FLAGS) $(GLOBAL_DEXPREOPT_FLAGS) $(ART_BOOT_IMAGE_EXTRA_ARGS)
endif