Revert "Fix VM-less builds."
This reverts commit 62753c474b83546f5f40ca114530a3f377a51bbc.
Bug: 18465297
Change-Id: I800198949e3837f8dab3ad966aeb7dac5d7911c0
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 @@
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_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_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)
ART_HOST_NON_DEBUG_CFLAGS := $(art_host_non_debug_cflags)
ART_TARGET_NON_DEBUG_CFLAGS := $(art_target_non_debug_cflags)