diff options
| author | Ying Wang <wangying@google.com> | 2014-03-20 22:27:16 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-20 22:27:16 +0000 |
| commit | 81717cc251d6890f5bf3fa042bd11d20c7ec556c (patch) | |
| tree | 39902eb863f23315a4483711d5adde980bd77752 /core/main.mk | |
| parent | 636dc20d1a2ddb44b345be5ad6e04024788ad90b (diff) | |
| parent | 84fbc7e82a0a075c3cc8bb73baa9e6d87fd53aa4 (diff) | |
| download | build-81717cc251d6890f5bf3fa042bd11d20c7ec556c.zip build-81717cc251d6890f5bf3fa042bd11d20c7ec556c.tar.gz build-81717cc251d6890f5bf3fa042bd11d20c7ec556c.tar.bz2 | |
am 84fbc7e8: am 996f3826: am c5a56344: am 1c43aaea: Merge "Remove the redundant DISABLE_DEXPREOPT"
* commit '84fbc7e82a0a075c3cc8bb73baa9e6d87fd53aa4':
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 50703c2..a0310a7 100644 --- a/core/main.mk +++ b/core/main.mk @@ -348,7 +348,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 |