summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJulien Desprez <jdesprez@google.com>2018-11-06 08:46:43 -0800
committerandroid-build-merger <android-build-merger@google.com>2018-11-06 08:46:43 -0800
commit3963c9061ee7993175a9be6e8e4508e8c93bc3c4 (patch)
treebfe67e6a6dbaef6ec43d87928e704bfc6e9e9a48
parent3ade6652a6fe55401db21ca886234e79603f47fd (diff)
parent825f1ad984e6d3f9abc808ced10c97fb8497c883 (diff)
downloadplatform_external_doclava-3963c9061ee7993175a9be6e8e4508e8c93bc3c4.tar.gz
platform_external_doclava-3963c9061ee7993175a9be6e8e4508e8c93bc3c4.tar.bz2
platform_external_doclava-3963c9061ee7993175a9be6e8e4508e8c93bc3c4.zip
Merge "Add a version of doclava without guava built in" am: 25ef586c68 am: 3a4f3ae6fc
am: 825f1ad984 Change-Id: I81b4f2ca86260da06497511be42ccd1b090da4b9
-rw-r--r--Android.bp20
1 files changed, 19 insertions, 1 deletions
diff --git a/Android.bp b/Android.bp
index 9314c31..d5ee50e 100644
--- a/Android.bp
+++ b/Android.bp
@@ -24,7 +24,7 @@ java_library_host {
],
static_libs: [
"jsilver",
- "guavalib",
+ "guava",
"antlr-runtime",
"tagsoup",
],
@@ -32,6 +32,24 @@ java_library_host {
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