diff options
| author | Mathieu Chartier <mathieuc@google.com> | 2015-03-19 16:59:02 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-03-19 16:59:02 +0000 |
| commit | b01a4ca3c838007d2e8f71c01b37f8e878cff686 (patch) | |
| tree | 8423633aa6b8fc884f79bafa9323410ff9d4d5c1 | |
| parent | abd5bbc4febe61f53641ac7c43160e161e12c1dc (diff) | |
| parent | 68f6e30521feced2dbd2e1dcb606f9f15cf5ec21 (diff) | |
| download | build-b01a4ca3c838007d2e8f71c01b37f8e878cff686.zip build-b01a4ca3c838007d2e8f71c01b37f8e878cff686.tar.gz build-b01a4ca3c838007d2e8f71c01b37f8e878cff686.tar.bz2 | |
am 68f6e305: am 9682e56a: Merge "Revert "Rename dalvik.vm.usejit to debug.dalvik.vm.usejit""
* commit '68f6e30521feced2dbd2e1dcb606f9f15cf5ec21':
Revert "Rename dalvik.vm.usejit to debug.dalvik.vm.usejit"
| -rw-r--r-- | CleanSpec.mk | 5 | ||||
| -rw-r--r-- | core/main.mk | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/CleanSpec.mk b/CleanSpec.mk index f34134a..0883039 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 61b2e5a..0e058af 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 ## |