openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

Merge "Allow 'export WITH_HOST_DALVIK=false' to override Makefile defaulting" into gingerbread

This commit is contained in:
Brian Carlstrom 2010-09-30 15:00:31 -07:00 committed by Android (Google) Code Review
parent f51f24a6ea e947865041
commit 46fc2341c5
1 changed files with 5 additions and 1 deletions
Show Stats 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
# --------------------------------------------------------------- # ---------------------------------------------------------------