commit 8b73c76a30414c23e079b99a5b85885f0a2ec9c5
author Andreas Gampe <agampe@google.com> Sun Mar 08 00:12:47 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Sun Mar 08 00:12:47 2015 +0000
tree f65fb71dfae85a3dd365b84f695d5b6aa04c1046
parent 131424e74c63b2a1c2d2528c51a0e319a3cc3d1f
parent 6faf9925b3c1f833681443195e43c07e11570b52

am 6faf9925: am e380c11d: am 9a0382ff: Merge "Build: Fail preopting apps when there are verifier errors"

* commit '6faf9925b3c1f833681443195e43c07e11570b52':
  Build: Fail preopting apps when there are verifier errors

core/dex_preopt_libart.mk

diff --git a/core/dex_preopt_libart.mk b/core/dex_preopt_libart.mk
index 9dc8af3..bee5d40 100644
--- a/core/dex_preopt_libart.mk
+++ b/core/dex_preopt_libart.mk
@@ -106,5 +106,6 @@
 	--instruction-set-variant=$($(PRIVATE_2ND_ARCH_VAR_PREFIX)DEX2OAT_TARGET_CPU_VARIANT) \
 	--instruction-set-features=$($(PRIVATE_2ND_ARCH_VAR_PREFIX)DEX2OAT_TARGET_INSTRUCTION_SET_FEATURES) \
 	--include-patch-information --runtime-arg -Xnorelocate --no-include-debug-symbols \
+	--abort-on-hard-verifier-error \
 	$(PRIVATE_DEX_PREOPT_FLAGS)
 endef