Merge "Make jit the default for all builds."

2015-11-11 08:47:36 +00:00 · 2015-11-11 08:47:36 +00:00 · 3b6db9c4c5
parent 2fb3ecbc6e 56a84e1b6c
commit 3b6db9c4c5
2 changed files with 1 additions and 1 deletions
--- a/core/main.mk
+++ b/core/main.mk
@ -415,7 +415,6 @@ ifndef is_sdk_build
  # Don't verify or compile apps on eng builds to speed startup.
  ADDITIONAL_BUILD_PROPERTIES += dalvik.vm.dex2oat-filter=verify-at-runtime
 endif
-  ADDITIONAL_BUILD_PROPERTIES += dalvik.vm.usejit=true
 endif

 ## sdk ##
--- a/target/product/runtime_libart.mk
+++ b/target/product/runtime_libart.mk
@ -52,3 +52,4 @@ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
    dalvik.vm.dex2oat-Xms=64m \
    dalvik.vm.dex2oat-Xmx=512m \
    ro.dalvik.vm.native.bridge=0 \
+    dalvik.vm.usejit=true \