am 9f8e214a: Only enable WITH_DEXPREOPT by default for libdvm.so

* commit '9f8e214a919097284a88cb19a1b85ceafc202a67':
  Only enable WITH_DEXPREOPT by default for libdvm.so
This commit is contained in:
Brian Carlstrom
2014-05-29 16:37:20 +00:00
committed by Android Git Automerger

View File

@@ -330,13 +330,15 @@ ifneq (,$(user_variant))
enable_target_debugging := enable_target_debugging :=
endif endif
# Turn on Dalvik preoptimization for user builds, but only if not # Turn on Dalvik preoptimization for libdvm.so user builds, but only if not
# explicitly disabled and the build is running on Linux (since host # explicitly disabled and the build is running on Linux (since host
# Dalvik isn't built for non-Linux hosts). # Dalvik isn't built for non-Linux hosts).
ifeq (,$(WITH_DEXPREOPT)) ifeq (,$(WITH_DEXPREOPT))
ifeq ($(user_variant),user) ifeq ($(DALVIK_VM_LIB),libdvm.so)
ifeq ($(HOST_OS),linux) ifeq ($(user_variant),user)
WITH_DEXPREOPT := true ifeq ($(HOST_OS),linux)
WITH_DEXPREOPT := true
endif
endif endif
endif endif
endif endif