From 8b11285dd990bd25e9c6c98be4a764008b09b2a8 Mon Sep 17 00:00:00 2001
From: Mathieu Chartier <mathieuc@google.com>
Date: Wed, 18 Mar 2015 18:52:40 -0700
Subject: [PATCH] Revert "Rename dalvik.vm.usejit to debug.dalvik.vm.usejit"

Bug: 19735273

This reverts commit 3abfcfc17b022a5af9d37403f81fae027ab850b9.

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

diff --git a/CleanSpec.mk b/CleanSpec.mk
index f34134ad25..088303923f 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -339,6 +339,11 @@ $(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)
 
+# Revert 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
 # ************************************************
diff --git a/core/main.mk b/core/main.mk
index 61b2e5a2d0..0e058af778 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -393,7 +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 += debug.dalvik.vm.usejit=true
+  ADDITIONAL_BUILD_PROPERTIES += dalvik.vm.usejit=true
 endif
 
 ## sdk ##