diff options
| author | Mathieu Chartier <mathieuc@google.com> | 2015-03-17 14:47:31 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-03-17 14:47:31 +0000 |
| commit | 7c2d49dcb9eeb4a53d95f7eceb55637fdd1afa35 (patch) | |
| tree | 8c7eef02c0c09e8f33027601d3a4db85be499485 | |
| parent | d268c14454e760ef156403614a3ab549eaaf3bf5 (diff) | |
| parent | 7b93109e48f90f756228bfe399b67d5d8cc306b0 (diff) | |
| download | build-7c2d49dcb9eeb4a53d95f7eceb55637fdd1afa35.zip build-7c2d49dcb9eeb4a53d95f7eceb55637fdd1afa35.tar.gz build-7c2d49dcb9eeb4a53d95f7eceb55637fdd1afa35.tar.bz2 | |
am 7b93109e: am d7f3d8ba: am 8ca542f4: Merge "Rename dalvik.vm.usejit to debug.dalvik.vm.usejit"
* commit '7b93109e48f90f756228bfe399b67d5d8cc306b0':
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 c0fe216..16fa38f 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) +# 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 a360d6c..5472729 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 ## |