commit 25ef586c68a5a059a9284464287552ee3cba3cc0
author Julien Desprez <jdesprez@google.com> Tue Nov 06 16:22:22 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Nov 06 16:22:22 2018 +0000
tree 03198c1df305be8cea2098e90cf8ab38f508341e
parent 473f1e058ae0c4c3149c6bf5669029107abd5c9a
parent 03eac1f68c734c660d72d40dfcf19539e51f92b6

Merge "Add a version of doclava without guava built in"

Android.bp

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