diff options
-rw-r--r-- | third_party/BUILD | 15 | ||||
-rw-r--r-- | third_party/README.md | 5 | ||||
-rw-r--r-- | third_party/checker_framework_dataflow/BUILD | 25 | ||||
-rw-r--r-- | third_party/checker_framework_javacutil/BUILD | 22 |
4 files changed, 58 insertions, 9 deletions
diff --git a/third_party/BUILD b/third_party/BUILD index d4afc7f070..ec5cbcb14a 100644 --- a/third_party/BUILD +++ b/third_party/BUILD @@ -16,6 +16,8 @@ filegroup( "//third_party/java/jdk/langtools:srcs", "//third_party/java/jdk/javabuilder:srcs", "//third_party/javascript/bootstrap:srcs", + "//third_party/checker_framework_dataflow:srcs", + "//third_party/checker_framework_javacutil:srcs", "//third_party/jformatstring:srcs", "//third_party/protobuf:srcs", "//third_party/py/concurrent:srcs", @@ -32,6 +34,8 @@ filegroup( filegroup( name = "gpl-srcs", srcs = [ + "//third_party/checker_framework_dataflow:srcs", + "//third_party/checker_framework_javacutil:srcs", "//third_party/jformatstring:srcs", ], ) @@ -282,11 +286,11 @@ java_import( "error_prone/error_prone_annotation-2.0.9-20160129.jar", ], exports = [ - ":checker_framework_dataflow", ":guava", ":jcip_annotations", ":jsr305", ":pcollections", + "//third_party/checker_framework_dataflow", "//third_party/jformatstring", ], ) @@ -305,18 +309,10 @@ java_import( ], ) -java_import( - name = "checker_framework_dataflow", - jars = [ - "checker_framework_dataflow/dataflow-1.8.10.jar", - ], -) - # For bootstrapping JavaBuilder filegroup( name = "error_prone-jars", srcs = [ - "checker_framework_dataflow/dataflow-1.8.10.jar", "error_prone/error_prone_annotation-2.0.9-20160129.jar", "error_prone/error_prone_annotations-2.0.9-20160129.jar", "error_prone/error_prone_core-2.0.9-20160129.jar", @@ -324,6 +320,7 @@ filegroup( "jcip_annotations/jcip-annotations-1.0-1.jar", "jsr305/jsr-305.jar", "pcollections/pcollections-2.1.2.jar", + "//third_party/checker_framework_dataflow:bootstrap", "//third_party/jformatstring:bootstrap", ], ) diff --git a/third_party/README.md b/third_party/README.md index 6ce99afc8b..a10cc2c2ce 100644 --- a/third_party/README.md +++ b/third_party/README.md @@ -118,6 +118,11 @@ a minimal set of extra dependencies. * Version: 1.8.10 * License: GNU GPL v2 with Classpath exception, portions MIT +## [Checker Framework Javacutil](http://code.google.com/p/checker-framework/) + +* Version: 1.8.10 +* License: GNU GPL v2 with Classpath exception, portions MIT + ## [Buck (iOS support)](http://facebook.github.io/buck/) * Version: commit id 2ff4f45a971776afcfbe88333d78c4ca6bf03df9 diff --git a/third_party/checker_framework_dataflow/BUILD b/third_party/checker_framework_dataflow/BUILD new file mode 100644 index 0000000000..5bcebeb7cb --- /dev/null +++ b/third_party/checker_framework_dataflow/BUILD @@ -0,0 +1,25 @@ +package(default_visibility = ["//visibility:public"]) + +licenses(["restricted"]) # GNU GPL v2 with Classpath exception + +filegroup( + name = "srcs", + srcs = glob(["**"]), +) + +java_library( + name = "checker_framework_dataflow", + srcs = glob(["java/**"]), + deps = [ + "//third_party/checker_framework_javacutil", + "@local_jdk//:langtools-neverlink", + ], +) + +load("//tools/build_rules:java_rules_skylark.bzl", "bootstrap_java_library") + +bootstrap_java_library( + name = "bootstrap", + srcs = glob(["java/**"]), + deps = ["//third_party/checker_framework_javacutil:bootstrap"], +) diff --git a/third_party/checker_framework_javacutil/BUILD b/third_party/checker_framework_javacutil/BUILD new file mode 100644 index 0000000000..cc18ab2020 --- /dev/null +++ b/third_party/checker_framework_javacutil/BUILD @@ -0,0 +1,22 @@ +package(default_visibility = ["//visibility:public"]) + +licenses(["restricted"]) # GNU GPL v2 with Classpath exception + +filegroup( + name = "srcs", + srcs = glob(["**"]), +) + +java_library( + name = "checker_framework_javacutil", + srcs = glob(["java/**"]), + deps = ["@local_jdk//:langtools-neverlink"], +) + +load("//tools/build_rules:java_rules_skylark.bzl", "bootstrap_java_library") + +bootstrap_java_library( + name = "bootstrap", + srcs = glob(["java/**"]), + neverlink_jars = ["@local_jdk//:langtools"], +) |