From 5e4d513eee15211985b3a711fb689b964f48b39f Mon Sep 17 00:00:00 2001 From: Nicolas Geoffray Date: Thu, 4 Dec 2014 17:25:00 +0000 Subject: On arm64/optimizing, compile the boot image with interpreter. Oterhwise the tests will fail because the backend is not fully implemented yet. Change-Id: I9dbd45279c7e515b52656825e1d4be92961b0da6 --- build/Android.oat.mk | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'build') diff --git a/build/Android.oat.mk b/build/Android.oat.mk index 4692ac4..27d12bd 100644 --- a/build/Android.oat.mk +++ b/build/Android.oat.mk @@ -145,13 +145,16 @@ define create-core-oat-target-rules # a dex2oat change to catch regressions early. ifeq ($(ART_USE_OPTIMIZING_COMPILER), true) core_dex2oat_dependency := $(DEX2OAT) + ifeq ($($(3)TARGET_ARCH),arm64) + # TODO: Enable image generation on arm64 once the backend + # is on par with other architectures. + core_compile_options += --compiler-filter=interpret-only + endif endif ifeq ($(1),optimizing) ifeq ($($(3)TARGET_ARCH),arm64) - # TODO: Enable image generation on arm64 once the backend - # is on par with other architectures. - core_compile_options += --compiler-backend=Quick + core_compile_options += --compiler-filter=interpret-only else core_compile_options += --compiler-backend=Optimizing core_dex2oat_dependency := $(DEX2OAT) -- cgit v1.1