diff options
| author | Nicolas Geoffray <ngeoffray@google.com> | 2014-12-03 13:36:10 +0000 |
|---|---|---|
| committer | Nicolas Geoffray <ngeoffray@google.com> | 2014-12-03 13:36:10 +0000 |
| commit | c9338b97c70d1b734695ccf9cb667708ac288b9d (patch) | |
| tree | 85e7a6568bf730e0168dabbf201d54eed5545629 /build/Android.oat.mk | |
| parent | bbba809a680fa7ad030da351e92786848d63b9bf (diff) | |
| download | android_art-c9338b97c70d1b734695ccf9cb667708ac288b9d.tar.gz android_art-c9338b97c70d1b734695ccf9cb667708ac288b9d.tar.bz2 android_art-c9338b97c70d1b734695ccf9cb667708ac288b9d.zip | |
Explicitly give compiler options to test scripts
This makes tests pass when ART_USE_OPTIMIZING_COMPILER=true.
Change-Id: I579c0371033435ead6b06830f15c00dbf7e98005
Diffstat (limited to 'build/Android.oat.mk')
| -rw-r--r-- | build/Android.oat.mk | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/build/Android.oat.mk b/build/Android.oat.mk index e8b363ba26..523d14345c 100644 --- a/build/Android.oat.mk +++ b/build/Android.oat.mk @@ -44,6 +44,9 @@ define create-core-oat-host-rules core_pic_infix := core_dex2oat_dependency := $(DEX2OAT_DEPENDENCY) + ifeq ($(1),default) + core_compile_options += --compiler-backend=Quick + endif ifeq ($(1),optimizing) core_compile_options += --compiler-backend=Optimizing # With the optimizing compiler, we want to rerun dex2oat whenever there is @@ -137,6 +140,9 @@ define create-core-oat-target-rules core_pic_infix := core_dex2oat_dependency := $(DEX2OAT_DEPENDENCY) + ifeq ($(1),default) + core_compile_options += --compiler-backend=Quick + endif ifeq ($(1),optimizing) ifeq ($($(3)TARGET_ARCH),arm64) # TODO: Enable image generation on arm64 once the backend |