From 56a84e1b6cb3368e3f97c1de03bb3b3980e29b18 Mon Sep 17 00:00:00 2001
From: Nicolas Geoffray <ngeoffray@google.com>
Date: Thu, 5 Nov 2015 16:49:49 +0000
Subject: [PATCH] Make jit the default for all builds.

Change-Id: Ifa4280cdab0747cae8d3e2becec47b230846def6
---
 core/main.mk                     | 1 -
 target/product/runtime_libart.mk | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/main.mk b/core/main.mk
index 7896d381e..a4326770f 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -415,7 +415,6 @@ ifndef is_sdk_build
   # Don't verify or compile apps on eng builds to speed startup.
   ADDITIONAL_BUILD_PROPERTIES += dalvik.vm.dex2oat-filter=verify-at-runtime
 endif
-  ADDITIONAL_BUILD_PROPERTIES += dalvik.vm.usejit=true
 endif
 
 ## sdk ##
diff --git a/target/product/runtime_libart.mk b/target/product/runtime_libart.mk
index c1779811e..3ffee067d 100644
--- a/target/product/runtime_libart.mk
+++ b/target/product/runtime_libart.mk
@@ -52,3 +52,4 @@ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
     dalvik.vm.dex2oat-Xms=64m \
     dalvik.vm.dex2oat-Xmx=512m \
     ro.dalvik.vm.native.bridge=0 \
+    dalvik.vm.usejit=true \