commit 87dded449494cc7ff9c7e0aee967031cd10c62e9
author Treehugger Robot <treehugger-gerrit@google.com> Thu Nov 23 01:56:06 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Nov 23 01:56:06 2017 +0000
tree dd5102c3de5dd36db16bc2cad8d3ed8b875e1836
parent 711bfabd50796d8378229177c0e9dc5174f2da38
parent 5ccf0900d0d0c568a5c58ab9ffd9e6349e845c52

Merge "Build: Make dex2oat boot image error abort explicit"

core/dex_preopt_libart_boot.mk

diff --git a/core/dex_preopt_libart_boot.mk b/core/dex_preopt_libart_boot.mk
index 302cc8b..8b71198 100644
--- a/core/dex_preopt_libart_boot.mk
+++ b/core/dex_preopt_libart_boot.mk
@@ -97,6 +97,8 @@
 		--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