From 0aea49c0ce66e518cf266b808e2297fe5dd59d45 Mon Sep 17 00:00:00 2001 From: Vladimir Marko Date: Wed, 10 Oct 2018 16:45:11 +0100 Subject: [PATCH] Prebuild: Remove --multi-image. The option is ignored since https://android-review.googlesource.com/784718 . Test: m test-art-host-gtest Test: testrunner.py --host --optimizing Test: Pixel 2 XL boots. Test: testrunner.py --target --optimizing Bug: 77856493 Change-Id: I32c323c0cabbd87cd1993c4355a354bc65529bc0 --- core/dex_preopt_libart_boot.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/dex_preopt_libart_boot.mk b/core/dex_preopt_libart_boot.mk index a56fd5ef55..14955f01b8 100644 --- a/core/dex_preopt_libart_boot.mk +++ b/core/dex_preopt_libart_boot.mk @@ -108,7 +108,7 @@ $($(my_2nd_arch_prefix)DEFAULT_DEX_PREOPT_BUILT_IMAGE_FILENAME) : $(LIBART_TARGE --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) \