StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 46fc2341: Merge "Allow \'export WITH_HOST_DALVIK=false\' to override Makefile defaulting" into gingerbread

Browse Source 
Merge commit '46fc2341c535ba624fd2dceec9399ce681a80866' into gingerbread-plus-aosp

* commit '46fc2341c535ba624fd2dceec9399ce681a80866':
  Allow 'export WITH_HOST_DALVIK=false' to override Makefile defaulting
This commit is contained in:
Brian Carlstrom
2010-09-30 15:02:49 -07:00
committed by Android Git Automerger
parent b68b6b558b 46fc2341c5
commit bdb2e9f3c2
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/envsetup.mk
View File

@@ -119,12 +119,16 @@ else
HOST_PREBUILT_TAG := $(HOST_OS)-$(HOST_ARCH) HOST_PREBUILT_TAG := $(HOST_OS)-$(HOST_ARCH)
endif 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) ifeq ($(HOST_OS),linux)
# ... but not if we're building the sim...
ifneq ($(TARGET_SIMULATOR),true) ifneq ($(TARGET_SIMULATOR),true)
# ... or if the if the option is already set
ifeq ($(WITH_HOST_DALVIK),)
WITH_HOST_DALVIK := true WITH_HOST_DALVIK := true
endif endif
endif endif
endif
# --------------------------------------------------------------- # ---------------------------------------------------------------