commit f696914fb5329cf1e646828749a1432ef9dd92b0
author Vladimir Marko <vmarko@google.com> Fri Oct 12 09:00:56 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Oct 12 09:00:56 2018 +0000
tree a36e1a4744ef56dd887ac2788e9d5a642b172f7b
parent f77560ec12b12b8a5ad35df2ff641d44938d61c1
parent 0aea49c0ce66e518cf266b808e2297fe5dd59d45

Merge "Prebuild: Remove --multi-image."

core/dex_preopt_libart_boot.mk

diff --git a/core/dex_preopt_libart_boot.mk b/core/dex_preopt_libart_boot.mk
index a56fd5e..14955f0 100644
--- a/core/dex_preopt_libart_boot.mk
+++ b/core/dex_preopt_libart_boot.mk
@@ -108,7 +108,7 @@
 		--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) \
 		--android-root=$(PRODUCT_OUT)/system \
-		--multi-image --no-inline-from=core-oj.jar \
+		--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) \