Fix Mac build by making dalvikvm definition visible
Change-Id: Ic8ef59f7bf9a88785b1c5e7fcc11a0942ef096a0
diff --git a/Android.mk b/Android.mk
index 39ce701..9d446fc 100644
--- a/Android.mk
+++ b/Android.mk
@@ -99,8 +99,10 @@
adb shell rm system/app/*.oat
adb shell rm data/run-test/test-*/dalvik-cache/*.oat
+# we aren't building most of art on darwin right now, but we do need to build new dalvikvm
ifeq ($(HOST_OS)-$(HOST_ARCH),darwin-x86)
art_dont_bother := true
+include $(LOCAL_PATH)/dalvikvm/Android.mk
endif
ifneq ($(art_dont_bother),true)
diff --git a/dalvikvm/Android.mk b/dalvikvm/Android.mk
index 869478d..5e5e40c 100644
--- a/dalvikvm/Android.mk
+++ b/dalvikvm/Android.mk
@@ -27,6 +27,7 @@
include external/stlport/libstlport.mk
include $(BUILD_EXECUTABLE)
+ifeq ($(WITH_HOST_DALVIK),true)
include $(CLEAR_VARS)
LOCAL_MODULE := dalvikvm
LOCAL_MODULE_TAGS := optional
@@ -37,3 +38,4 @@
LOCAL_LDFLAGS := -ldl
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
include $(BUILD_HOST_EXECUTABLE)
+endif