diff options
| author | Mathieu Chartier <mathieuc@google.com> | 2015-03-19 17:06:47 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-03-19 17:06:47 +0000 |
| commit | eda38d7718173089260a7a6fd0d80e780412f8b7 (patch) | |
| tree | 87f6a624c22df6a27b53ef6619a9d2fa5a5925a3 | |
| parent | e596433b9022932cd694f14659943df136376c9a (diff) | |
| parent | b01a4ca3c838007d2e8f71c01b37f8e878cff686 (diff) | |
| download | build-eda38d7718173089260a7a6fd0d80e780412f8b7.zip build-eda38d7718173089260a7a6fd0d80e780412f8b7.tar.gz build-eda38d7718173089260a7a6fd0d80e780412f8b7.tar.bz2 | |
am b01a4ca3: am 68f6e305: am 9682e56a: Merge "Revert "Rename dalvik.vm.usejit to debug.dalvik.vm.usejit""
* commit 'b01a4ca3c838007d2e8f71c01b37f8e878cff686':
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 16fa38f..970d0f8 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -344,6 +344,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 5472729..a360d6c 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 ## |