diff options
| author | Brian Carlstrom <bdc@google.com> | 2010-09-30 14:41:54 -0700 |
|---|---|---|
| committer | Brian Carlstrom <bdc@google.com> | 2010-09-30 14:41:54 -0700 |
| commit | e947865041c3e8b32ea43e74d95c33e2153152ee (patch) | |
| tree | ce88609963489c8b76d74fb065d3af44bd7af5bb | |
| parent | 0b9382c792c303a93f5805adf4eba377dac01950 (diff) | |
| download | build-e947865041c3e8b32ea43e74d95c33e2153152ee.zip build-e947865041c3e8b32ea43e74d95c33e2153152ee.tar.gz build-e947865041c3e8b32ea43e74d95c33e2153152ee.tar.bz2 | |
Allow 'export WITH_HOST_DALVIK=false' to override Makefile defaulting
Change-Id: I8915bc1c9f52a3b6ab1a82b404ab61cd0726198d
| -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 f556efe..72c7961 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 # --------------------------------------------------------------- |