commit 6427df118e2c31962d3b8afc4231c9c3d430ad9c
author Nicolas Geoffray <ngeoffray@google.com> Wed Dec 17 12:34:15 2014 +0000
committer Nicolas Geoffray <ngeoffray@google.com> Wed Dec 17 12:34:15 2014 +0000
tree eb518282b1144c01228d6d2fc25981febb7e69d1
parent 3fea27b5f956a08b5b01f873b807fac98a5cc1f6

Explicitly compile core.oat with the Quick compiler.

Change-Id: Id9e301268a75f6002855c690c9324bbcbee3ed6e

build/Android.oat.mk

diff --git a/build/Android.oat.mk b/build/Android.oat.mk
index d4fd519..8d49565 100644
--- a/build/Android.oat.mk
+++ b/build/Android.oat.mk
@@ -52,6 +52,9 @@
     core_dex2oat_dependency := $(DEX2OAT)
   endif
 
+  ifeq ($(1),default)
+    core_compile_options += --compiler-backend=Quick
+  endif
   ifeq ($(1),optimizing)
     core_compile_options += --compiler-backend=Optimizing
     core_dex2oat_dependency := $(DEX2OAT)
@@ -163,6 +166,9 @@
     core_dex2oat_dependency := $(DEX2OAT)
   endif
 
+  ifeq ($(1),default)
+    core_compile_options += --compiler-backend=Quick
+  endif
   ifeq ($(1),optimizing)
     core_compile_options += --compiler-backend=Optimizing
     core_dex2oat_dependency := $(DEX2OAT)