diff options
| author | 2014-12-02 13:28:21 +0100 | |
|---|---|---|
| committer | 2014-12-03 11:25:57 +0100 | |
| commit | 62753c474b83546f5f40ca114530a3f377a51bbc (patch) | |
| tree | a12b0f3306ee9a454e6f1a3aa30b1706ecda077c | |
| parent | f7ebda43cb185b6414a2e86eef95eaf10b74db2c (diff) | |
Fix VM-less builds.
This patch modifies Android.common_build.mk to avoid breaking the build
when trying to generate a system image that doesn't include a VM (which
is useful for low-level emulator feature testing, not general Android
development).
BUG=18581643
Change-Id: Ib75ebf14d3e9c8fc2ac591c7edd2ab4d6ff2ca89
| -rw-r--r-- | build/Android.common_build.mk | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/build/Android.common_build.mk b/build/Android.common_build.mk index b3d1380558..9275c97808 100644 --- a/build/Android.common_build.mk +++ b/build/Android.common_build.mk @@ -262,16 +262,21 @@ ifeq ($(HOST_OS),linux) art_target_non_debug_cflags += -Wframe-larger-than=1728 endif -ifndef LIBART_IMG_HOST_BASE_ADDRESS - $(error LIBART_IMG_HOST_BASE_ADDRESS unset) -endif -ART_HOST_CFLAGS += $(art_cflags) -DART_BASE_ADDRESS=$(LIBART_IMG_HOST_BASE_ADDRESS) -ART_HOST_CFLAGS += -DART_DEFAULT_INSTRUCTION_SET_FEATURES=default +# DALVIK_VM_LIB will be empty for VM-less builds. Avoid $(error) calls here because +# LIBART_IMG_XXX variables won't be defined. +ifneq ($(DALVIK_VM_LIB),) + ifndef LIBART_IMG_HOST_BASE_ADDRESS + $(error LIBART_IMG_HOST_BASE_ADDRESS unset) + endif + ART_HOST_CFLAGS += $(art_cflags) -DART_BASE_ADDRESS=$(LIBART_IMG_HOST_BASE_ADDRESS) + ART_HOST_CFLAGS += -DART_DEFAULT_INSTRUCTION_SET_FEATURES=default -ifndef LIBART_IMG_TARGET_BASE_ADDRESS - $(error LIBART_IMG_TARGET_BASE_ADDRESS unset) + ifndef LIBART_IMG_TARGET_BASE_ADDRESS + $(error LIBART_IMG_TARGET_BASE_ADDRESS unset) + endif + ART_TARGET_CFLAGS += $(art_cflags) \ + -DART_TARGET -DART_BASE_ADDRESS=$(LIBART_IMG_TARGET_BASE_ADDRESS) endif -ART_TARGET_CFLAGS += $(art_cflags) -DART_TARGET -DART_BASE_ADDRESS=$(LIBART_IMG_TARGET_BASE_ADDRESS) ART_HOST_NON_DEBUG_CFLAGS := $(art_host_non_debug_cflags) ART_TARGET_NON_DEBUG_CFLAGS := $(art_target_non_debug_cflags) |