diff options
| author | Nicolas Geoffray <ngeoffray@google.com> | 2014-12-04 17:25:00 +0000 |
|---|---|---|
| committer | Nicolas Geoffray <ngeoffray@google.com> | 2014-12-04 17:25:00 +0000 |
| commit | 5e4d513eee15211985b3a711fb689b964f48b39f (patch) | |
| tree | 26caa367844fa6f7ee05f7b0609722ab52ce5b76 /build | |
| parent | 7c8ce29e97fb7873160ab8895d847e9643a1f8f6 (diff) | |
| download | art-5e4d513eee15211985b3a711fb689b964f48b39f.zip art-5e4d513eee15211985b3a711fb689b964f48b39f.tar.gz art-5e4d513eee15211985b3a711fb689b964f48b39f.tar.bz2 | |
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
Diffstat (limited to 'build')
| -rw-r--r-- | build/Android.oat.mk | 9 |
1 files changed, 6 insertions, 3 deletions
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) |