diff options
| author | Brian Carlstrom <bdc@google.com> | 2010-09-30 15:02:49 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-30 15:02:49 -0700 |
| commit | bdb2e9f3c203655648bd0a4e5ea64e9bb2cb2a13 (patch) | |
| tree | e3f7a8cc29724a40d9fc7569e36816e339f9a9c2 /core/envsetup.mk | |
| parent | b68b6b558b779f731613b5ebf6fe9090c319ce65 (diff) | |
| parent | 46fc2341c535ba624fd2dceec9399ce681a80866 (diff) | |
| download | build-bdb2e9f3c203655648bd0a4e5ea64e9bb2cb2a13.zip build-bdb2e9f3c203655648bd0a4e5ea64e9bb2cb2a13.tar.gz build-bdb2e9f3c203655648bd0a4e5ea64e9bb2cb2a13.tar.bz2 | |
am 46fc2341: Merge "Allow \'export WITH_HOST_DALVIK=false\' to override Makefile defaulting" into gingerbread
Merge commit '46fc2341c535ba624fd2dceec9399ce681a80866' into gingerbread-plus-aosp
* commit '46fc2341c535ba624fd2dceec9399ce681a80866':
Allow 'export WITH_HOST_DALVIK=false' to override Makefile defaulting
Diffstat (limited to 'core/envsetup.mk')
| -rw-r--r-- | core/envsetup.mk | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/core/envsetup.mk b/core/envsetup.mk index 79e8b01..6b9271d 100644 --- a/core/envsetup.mk +++ b/core/envsetup.mk @@ -119,12 +119,16 @@ else HOST_PREBUILT_TAG := $(HOST_OS)-$(HOST_ARCH) endif -# Build dalvikvm on hosts that support it, but not if we're building the sim +# Default to building dalvikvm on hosts that support it... ifeq ($(HOST_OS),linux) +# ... but not if we're building the sim... ifneq ($(TARGET_SIMULATOR),true) +# ... or if the if the option is already set +ifeq ($(WITH_HOST_DALVIK),) WITH_HOST_DALVIK := true endif endif +endif # --------------------------------------------------------------- |