commit 0694eabe4de8231932a559498ee7784568794f81
author Mathieu Chartier <mathieuc@google.com> Wed Mar 11 18:45:47 2015 -0700
committer Mathieu Chartier <mathieuc@google.com> Thu Mar 12 18:27:54 2015 -0700
tree 6665248d52095e9e4512d242135572180269815c
parent 84f62c3ad337b7019141e1b6ad5fe1e9dad211fc

JIT default opt-in

Bug: 17950037

(cherry picked from commit 2a2a03046ecea689ff8cc86b80c27c24905c2d60)

Change-Id: I97fd6b1797e54ad3dea1930889f32a717543490d

CleanSpec.mk

diff --git a/CleanSpec.mk b/CleanSpec.mk
index bfa236c..c0fe216 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -334,6 +334,11 @@
 $(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
 # ************************************************

core/main.mk

diff --git a/core/main.mk b/core/main.mk
index 2c15d0f..a360d6c 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -393,6 +393,7 @@
   # 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 ##