diff options
| author | Andy McFadden <fadden@android.com> | 2010-09-24 15:55:42 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-24 15:55:42 -0700 |
| commit | 9cd6150cf5833ac84df0381d32ffddfc1caf1858 (patch) | |
| tree | ebd585476a3bd1d89e04d998b1bd3b3987533b16 /core/envsetup.mk | |
| parent | 62185bbd6cb52a1a0ef5121f1fcc3b0080646b1d (diff) | |
| parent | 12165990162ac3c41aed96d5afd5e228daa16877 (diff) | |
| download | build-9cd6150cf5833ac84df0381d32ffddfc1caf1858.zip build-9cd6150cf5833ac84df0381d32ffddfc1caf1858.tar.gz build-9cd6150cf5833ac84df0381d32ffddfc1caf1858.tar.bz2 | |
am 12165990: am 6474811d: Fix sim-eng build.
Merge commit '12165990162ac3c41aed96d5afd5e228daa16877'
* commit '12165990162ac3c41aed96d5afd5e228daa16877':
Fix sim-eng build.
Diffstat (limited to 'core/envsetup.mk')
| -rw-r--r-- | core/envsetup.mk | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/core/envsetup.mk b/core/envsetup.mk index 2142439..fe43529 100644 --- a/core/envsetup.mk +++ b/core/envsetup.mk @@ -119,10 +119,12 @@ else HOST_PREBUILT_TAG := $(HOST_OS)-$(HOST_ARCH) endif -# Build dalvikvm on hosts that support it +# Build dalvikvm on hosts that support it, but not if we're building the sim ifeq ($(HOST_OS),linux) +ifneq ($(TARGET_SIMULATOR),true) WITH_HOST_DALVIK := true endif +endif # --------------------------------------------------------------- |