commit 12165990162ac3c41aed96d5afd5e228daa16877
author Andy McFadden <fadden@android.com> Fri Sep 24 12:33:50 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Sep 24 12:33:50 2010 -0700
tree d331eecec16c1c5ef85e9ae9e3f0bba2f8206ced
parent 954a5e606ba6af5aef514c2c4c0d3ea2554b48f9
parent 6474811d646153aeab111c1c0586b6ee53dcb0d2

am 6474811d: Fix sim-eng build.

Merge commit '6474811d646153aeab111c1c0586b6ee53dcb0d2' into gingerbread-plus-aosp

* commit '6474811d646153aeab111c1c0586b6ee53dcb0d2':
  Fix sim-eng build.

core/envsetup.mk

diff --git a/core/envsetup.mk b/core/envsetup.mk
index 274ef67..79e8b01 100644
--- a/core/envsetup.mk
+++ b/core/envsetup.mk
@@ -119,10 +119,12 @@
   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
 
 
 # ---------------------------------------------------------------