diff options
| author | Ying Wang <wangying@google.com> | 2014-06-11 19:26:30 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-11 19:26:30 +0000 |
| commit | f7988507f48576d1455696693281b63d8ba7f478 (patch) | |
| tree | 44272e70b3889a2381b30ac976d0d081301cdf74 /core/product_config.mk | |
| parent | 80d3bd158270d53c2bfbb45c53160d2e89e87e1d (diff) | |
| parent | 2d19cbd279ed69c7202f089be174c35c1585f709 (diff) | |
| download | build-f7988507f48576d1455696693281b63d8ba7f478.zip build-f7988507f48576d1455696693281b63d8ba7f478.tar.gz build-f7988507f48576d1455696693281b63d8ba7f478.tar.bz2 | |
am 2d19cbd2: resolved conflicts for merge of 135e11df to klp-modular-dev-plus-aosp
* commit '2d19cbd279ed69c7202f089be174c35c1585f709':
Switch to 32-bit-by-default host multilib build.
Diffstat (limited to 'core/product_config.mk')
| -rw-r--r-- | core/product_config.mk | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/core/product_config.mk b/core/product_config.mk index f7dcb41..8fa5102 100644 --- a/core/product_config.mk +++ b/core/product_config.mk @@ -164,13 +164,11 @@ endif # unbundled_goals # Default to building dalvikvm on hosts that support it... ifeq ($(HOST_OS),linux) -ifneq ($(HOST_ARCH),x86_64) # ... or if the if the option is already set ifeq ($(WITH_HOST_DALVIK),) WITH_HOST_DALVIK := true endif endif -endif # --------------------------------------------------------------- # Include the product definitions. |