commit 3abfcfc17b022a5af9d37403f81fae027ab850b9
author Mathieu Chartier <mathieuc@google.com> Mon Mar 16 16:14:56 2015 -0700
committer Mathieu Chartier <mathieuc@google.com> Mon Mar 16 16:29:30 2015 -0700
tree a3954550177e603385429e286543fea9db88e8b0
parent d73696c1fefface6f3d2311d1dead3afae01b048

Rename dalvik.vm.usejit to debug.dalvik.vm.usejit

Bug: 19735273
Change-Id: Ia0d748b511230f5e0c7d0763de3abeab9d6e0ca7

CleanSpec.mk

diff --git a/CleanSpec.mk b/CleanSpec.mk
index f5f7991..f34134a 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -334,6 +334,11 @@
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/root/default.prop)
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/recovery/root/default.prop)
 
+# Rename dalvik.vm.usejit to debug.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 0e058af..61b2e5a 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -393,7 +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
+  ADDITIONAL_BUILD_PROPERTIES += debug.dalvik.vm.usejit=true
 endif
 
 ## sdk ##