diff options
| author | Ying Wang <wangying@google.com> | 2014-03-20 20:18:38 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-20 20:18:38 +0000 |
| commit | 996f3826f7005cf207c8565f674ee38df1ada153 (patch) | |
| tree | 4f3177cc6e90a51e9ae018924e73d8b3adf3d993 /core/main.mk | |
| parent | 46d69e9914ad359b63637f9734cf9e85e04af1a9 (diff) | |
| parent | c5a563447a68c30dd998b7cd6f8f8c30693edc37 (diff) | |
| download | build-996f3826f7005cf207c8565f674ee38df1ada153.zip build-996f3826f7005cf207c8565f674ee38df1ada153.tar.gz build-996f3826f7005cf207c8565f674ee38df1ada153.tar.bz2 | |
am c5a56344: am 1c43aaea: Merge "Remove the redundant DISABLE_DEXPREOPT"
* commit 'c5a563447a68c30dd998b7cd6f8f8c30693edc37':
Remove the redundant DISABLE_DEXPREOPT
Diffstat (limited to 'core/main.mk')
| -rw-r--r-- | core/main.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/main.mk b/core/main.mk index 37b2d23..f287b63 100644 --- a/core/main.mk +++ b/core/main.mk @@ -343,7 +343,7 @@ ifneq (,$(user_variant)) # Turn on Dalvik preoptimization for user builds, but only if not # explicitly disabled and the build is running on Linux (since host # Dalvik isn't built for non-Linux hosts). - ifneq (true,$(DISABLE_DEXPREOPT)) + ifeq (,$(WITH_DEXPREOPT)) ifeq ($(user_variant),user) ifeq ($(HOST_OS),linux) WITH_DEXPREOPT := true |