summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMathieu Chartier <mathieuc@google.com>2015-03-17 02:04:41 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2015-03-17 02:04:42 +0000
commit8ca542f4394affd420271d8df946e199449508e6 (patch)
tree7ccd55973ba0898339ff85d06cf92f8965d715e0
parent13169ccba2d9e11e311babd8fc80f41c610c753e (diff)
parent3abfcfc17b022a5af9d37403f81fae027ab850b9 (diff)
downloadbuild-8ca542f4394affd420271d8df946e199449508e6.zip
build-8ca542f4394affd420271d8df946e199449508e6.tar.gz
build-8ca542f4394affd420271d8df946e199449508e6.tar.bz2
Merge "Rename dalvik.vm.usejit to debug.dalvik.vm.usejit"
-rw-r--r--CleanSpec.mk5
-rw-r--r--core/main.mk2
2 files changed, 6 insertions, 1 deletions
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)/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)
+# 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 0e058af..61b2e5a 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 += dalvik.vm.usejit=true
+ ADDITIONAL_BUILD_PROPERTIES += debug.dalvik.vm.usejit=true
endif
## sdk ##