diff options
| author | Mathieu Chartier <mathieuc@google.com> | 2015-03-13 01:24:32 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-03-13 01:24:33 +0000 |
| commit | cf26fb819da63fee37d4c8070f213b404a0b7fe7 (patch) | |
| tree | 361bd3aef80c78d88a768edb0e5a4f94f8ddcf2d | |
| parent | d3d682e3751f6418ea5519a484542e687c44addb (diff) | |
| parent | 2a2a03046ecea689ff8cc86b80c27c24905c2d60 (diff) | |
| download | build-cf26fb819da63fee37d4c8070f213b404a0b7fe7.zip build-cf26fb819da63fee37d4c8070f213b404a0b7fe7.tar.gz build-cf26fb819da63fee37d4c8070f213b404a0b7fe7.tar.bz2 | |
Merge "JIT default opt-in"
| -rw-r--r-- | CleanSpec.mk | 5 | ||||
| -rw-r--r-- | core/main.mk | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/CleanSpec.mk b/CleanSpec.mk index 5b18d44..f5f7991 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -329,6 +329,11 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/APPS/*) # instead. $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop) +# Adding 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 981ecef..4a2a626 100644 --- a/core/main.mk +++ b/core/main.mk @@ -390,6 +390,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 endif ## sdk ## |