diff options
| author | Ian Rogers <irogers@google.com> | 2014-01-31 16:41:27 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-01-31 16:41:27 +0000 |
| commit | 69968b8c5762a8c7f6127f4aa667b8e8498c5102 (patch) | |
| tree | 5b459398e794ac76f0e3bd736ec95491a615616f /core/product_config.mk | |
| parent | 7201cdef712a8ff12313de746eb8b0dd4fd8ff51 (diff) | |
| parent | 1fee45f1af82d9dbb2e709413f020b2291205640 (diff) | |
| download | build-69968b8c5762a8c7f6127f4aa667b8e8498c5102.zip build-69968b8c5762a8c7f6127f4aa667b8e8498c5102.tar.gz build-69968b8c5762a8c7f6127f4aa667b8e8498c5102.tar.bz2 | |
am 1fee45f1: am e854276d: Merge "Disable WITH_HOST_DALVIK on 64bit host builds."
* commit '1fee45f1af82d9dbb2e709413f020b2291205640':
Disable WITH_HOST_DALVIK on 64bit host builds.
Diffstat (limited to 'core/product_config.mk')
| -rw-r--r-- | core/product_config.mk | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/core/product_config.mk b/core/product_config.mk index 1333ff8..171c394 100644 --- a/core/product_config.mk +++ b/core/product_config.mk @@ -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. |