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

am: 87dded4494

Change-Id: I44e5a6cf2fa976dddd882107ffc152a602778fd9
This commit is contained in:
Andreas Gampe 2017-11-23 02:00:05 +00:00 committed by android-build-merger
commit f1d0d93fa2
1 changed files with 2 additions and 0 deletions

View File

@ -97,6 +97,8 @@ $($(my_2nd_arch_prefix)DEFAULT_DEX_PREOPT_BUILT_IMAGE_FILENAME) : $(LIBART_TARGE
--runtime-arg -Xnorelocate --compile-pic \ --runtime-arg -Xnorelocate --compile-pic \
--no-generate-debug-info --generate-build-id \ --no-generate-debug-info --generate-build-id \
--multi-image --no-inline-from=core-oj.jar \ --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) $(PRODUCT_DEX_PREOPT_BOOT_FLAGS) $(GLOBAL_DEXPREOPT_FLAGS) $(ART_BOOT_IMAGE_EXTRA_ARGS)
endif endif