Merge "Disable WITH_HOST_DALVIK on 64bit host builds."
This commit is contained in:
@@ -164,11 +164,13 @@ endif # unbundled_goals
|
|||||||
|
|
||||||
# Default to building dalvikvm on hosts that support it...
|
# Default to building dalvikvm on hosts that support it...
|
||||||
ifeq ($(HOST_OS),linux)
|
ifeq ($(HOST_OS),linux)
|
||||||
|
ifeq ($(BUILD_HOST_64bit),)
|
||||||
# ... or if the if the option is already set
|
# ... or if the if the option is already set
|
||||||
ifeq ($(WITH_HOST_DALVIK),)
|
ifeq ($(WITH_HOST_DALVIK),)
|
||||||
WITH_HOST_DALVIK := true
|
WITH_HOST_DALVIK := true
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
endif
|
||||||
|
|
||||||
# ---------------------------------------------------------------
|
# ---------------------------------------------------------------
|
||||||
# Include the product definitions.
|
# Include the product definitions.
|
||||||
|
Reference in New Issue
Block a user