Merge "build: Add host-side dalvik library rules"
diff --git a/Android.mk b/Android.mk
index 7c6cfd9..b45f64a 100644
--- a/Android.mk
+++ b/Android.mk
@@ -31,3 +31,13 @@
 LOCAL_JAVA_LANGUAGE_VERSION := 1.7
 
 include $(BUILD_HOST_JAVA_LIBRARY)
+
+
+# Also build a host-side dalvik library
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := $(call all-java-files-under, guava/src)
+LOCAL_MODULE := guava-hostdex
+LOCAL_STATIC_JAVA_LIBRARIES := jsr305-hostdex
+
+include $(BUILD_HOST_DALVIK_JAVA_LIBRARY)