Merge "Disable WITH_HOST_DALVIK on 64bit host builds."

This commit is contained in:
Ian Rogers 2014-01-30 19:54:04 +00:00 committed by Gerrit Code Review
commit e854276dd1

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.