From 0694eabe4de8231932a559498ee7784568794f81 Mon Sep 17 00:00:00 2001
From: Mathieu Chartier <mathieuc@google.com>
Date: Wed, 11 Mar 2015 18:45:47 -0700
Subject: [PATCH] JIT default opt-in

Bug: 17950037

(cherry picked from commit 2a2a03046ecea689ff8cc86b80c27c24905c2d60)

Change-Id: I97fd6b1797e54ad3dea1930889f32a717543490d
---
 CleanSpec.mk | 5 +++++
 core/main.mk | 1 +
 2 files changed, 6 insertions(+)

diff --git a/CleanSpec.mk b/CleanSpec.mk
index bfa236c69b..c0fe2165ab 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -334,6 +334,11 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop)
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/*)
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/APPS/*)
 
+# Adding dalvik.vm.usejit
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/root/default.prop)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/recovery/root/default.prop)
+
 # ************************************************
 # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
 # ************************************************
diff --git a/core/main.mk b/core/main.mk
index 2c15d0f01b..a360d6cc3a 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -393,6 +393,7 @@ ifndef is_sdk_build
   # Don't compile apps on eng builds to speed startup
   ADDITIONAL_BUILD_PROPERTIES += dalvik.vm.dex2oat-filter=interpret-only
 endif
+  ADDITIONAL_BUILD_PROPERTIES += dalvik.vm.usejit=true
 endif
 
 ## sdk ##