diff --git a/Android.bp b/Android.bp
index 9314c31..d5ee50e 100644
--- a/Android.bp
+++ b/Android.bp
@@ -24,7 +24,7 @@
     ],
     static_libs: [
         "jsilver",
-        "guavalib",
+        "guava",
         "antlr-runtime",
         "tagsoup",
     ],
@@ -32,6 +32,24 @@
     java_resource_dirs: ["res"],
 }
 
+java_library_host {
+    name: "doclava-no-guava",
+    srcs: [
+        "src/**/*.java",
+    ],
+    libs: [
+        "guava",
+    ],
+    static_libs: [
+        "jsilver",
+        "antlr-runtime",
+        "tagsoup",
+    ],
+    use_tools_jar: true,
+    java_resource_dirs: ["res"],
+}
+
+
 // TODO: add a test target.
 // For now, you can run the unit tests thus:
 // vogar --classpath /usr/lib/jvm/java-6-sun/lib/tools.jar --classpath ../../out/host/common/obj/JAVA_LIBRARIES/antlr_intermediates/javalib.jar --sourcepath src/ --sourcepath ../jsilver/src/ --mode jvm test/doclava/ApiCheckTest.java