am e854276d: Merge "Disable WITH_HOST_DALVIK on 64bit host builds."

* commit 'e854276dd19ee0ce139cc35f98b49189b7750b2d':
  Disable WITH_HOST_DALVIK on 64bit host builds.
This commit is contained in:
Ian Rogers
2014-01-31 12:17:16 +00:00
committed by Android Git Automerger

View File

@@ -164,11 +164,13 @@ endif # unbundled_goals
# Default to building dalvikvm on hosts that support it...
ifeq ($(HOST_OS),linux)
ifeq ($(BUILD_HOST_64bit),)
# ... or if the if the option is already set
ifeq ($(WITH_HOST_DALVIK),)
WITH_HOST_DALVIK := true
endif
endif
endif
# ---------------------------------------------------------------
# Include the product definitions.