diff options
| author | Andreas Gampe <agampe@google.com> | 2014-10-04 15:45:06 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-04 15:45:06 +0000 |
| commit | ec70fdaa35dc5352e65b76601b36294f5af649df (patch) | |
| tree | 74bbd70a30f3f073decb3006abc0af4661f6b655 /core/main.mk | |
| parent | 0ecfde0dfdf0b216cb5963914c17113a3ad9dcba (diff) | |
| parent | d8a89a8847897dd3c0a2b05dcc09c6f3ccc44c8f (diff) | |
| download | build-ec70fdaa35dc5352e65b76601b36294f5af649df.zip build-ec70fdaa35dc5352e65b76601b36294f5af649df.tar.gz build-ec70fdaa35dc5352e65b76601b36294f5af649df.tar.bz2 | |
am d8a89a88: am c776f063: Merge "Build: Do not set interpreted mode for SDK build" into lmp-dev
* commit 'd8a89a8847897dd3c0a2b05dcc09c6f3ccc44c8f':
Build: Do not set interpreted mode for SDK build
Diffstat (limited to 'core/main.mk')
| -rw-r--r-- | core/main.mk | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/core/main.mk b/core/main.mk index 666bd21..7ca30c7 100644 --- a/core/main.mk +++ b/core/main.mk @@ -377,10 +377,12 @@ ifneq ($(filter ro.setupwizard.mode=ENABLED, $(call collapse-pairs, $(ADDITIONAL $(call collapse-pairs, $(ADDITIONAL_BUILD_PROPERTIES))) \ ro.setupwizard.mode=OPTIONAL endif -# Don't even verify the image on eng builds to speed startup -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-filter=interpret-only +ifndef is_sdk_build + # Don't even verify the image on eng builds to speed startup + 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-filter=interpret-only +endif endif ## sdk ## |