commit cced082f5d8e6386815a5cfba125789e78c5e7ca
author Brian Carlstrom <bdc@google.com> Mon Jul 28 19:13:27 2014 -0700
committer Brian Carlstrom <bdc@google.com> Wed Aug 06 17:50:39 2014 -0700
tree 8fcc0cece7e2ff2dd53ddfe9f496f1a801ab5d73
parent 56ef86df84ba7d8b26b663f49ae40f8c86b4b95b

Move from dalvik.vm.image-dex2oat-flags to dalvik.vm.dex2oat-filter [build]

This will allow us to conditionally change the compiler-filter based on other properties.

Bug: 15165413

(cherry picked from commit 4d30e5e2604a77df2acd41e36cbca54cd42cbf0a)

Change-Id: I84e8038c6536291e6775f39b33556b8169fdf292

core/main.mk

diff --git a/core/main.mk b/core/main.mk
index cdf3200..f33574b 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -374,9 +374,9 @@
           ro.setupwizard.mode=OPTIONAL
 endif
 # Don't even verify the image on eng builds to speed startup
-ADDITIONAL_BUILD_PROPERTIES += dalvik.vm.image-dex2oat-flags=--compiler-filter=verify-none
+ADDITIONAL_BUILD_PROPERTIES += dalvik.vm.image-dex2oat-filter=verify-none
 # Don't compile apps on eng builds to speed startup
-ADDITIONAL_BUILD_PROPERTIES += dalvik.vm.dex2oat-flags=--compiler-filter=interpret-only
+ADDITIONAL_BUILD_PROPERTIES += dalvik.vm.dex2oat-filter=interpret-only
 endif
 
 ## sdk ##