diff options
| author | Ying Wang <wangying@google.com> | 2014-12-08 14:29:34 -0800 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2014-12-08 15:10:24 -0800 |
| commit | a28ff0f8a4df47a53041a69e611b841d8d38b3a1 (patch) | |
| tree | e309f5edb058417166aff4bcce8042a5fe07d695 /build/Android.common_build.mk | |
| parent | 52222d132e500235aeaa427e2f4139dc20ed9288 (diff) | |
| download | art-a28ff0f8a4df47a53041a69e611b841d8d38b3a1.zip art-a28ff0f8a4df47a53041a69e611b841d8d38b3a1.tar.gz art-a28ff0f8a4df47a53041a69e611b841d8d38b3a1.tar.bz2 | |
Revert "Fix VM-less builds."
This reverts commit 62753c474b83546f5f40ca114530a3f377a51bbc.
Bug: 18465297
Change-Id: I800198949e3837f8dab3ad966aeb7dac5d7911c0
Diffstat (limited to 'build/Android.common_build.mk')
| -rw-r--r-- | build/Android.common_build.mk | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/build/Android.common_build.mk b/build/Android.common_build.mk index 6346970..5dd9f15 100644 --- a/build/Android.common_build.mk +++ b/build/Android.common_build.mk @@ -259,21 +259,16 @@ ifeq ($(HOST_OS),linux) art_target_non_debug_cflags += -Wframe-larger-than=1728 endif -# 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_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) - endif - ART_TARGET_CFLAGS += $(art_cflags) \ - -DART_TARGET -DART_BASE_ADDRESS=$(LIBART_IMG_TARGET_BASE_ADDRESS) +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) ART_HOST_NON_DEBUG_CFLAGS := $(art_host_non_debug_cflags) ART_TARGET_NON_DEBUG_CFLAGS := $(art_target_non_debug_cflags) |