Skip to content

Commit

Permalink
Vendor jaxb library in our third_party.
Browse files Browse the repository at this point in the history
We want to upgrade the embedded JDK to version 11 (see bazelbuild#6592). However,
some Java EE modules were removed from 10 to 11:
http://openjdk.java.net/jeps/320

From these modules, we need java.xml.bind for the android_common
dependency which is used by the android_sdk_repository rule.
This will be starlark-ified some time in the future and then will also
move the tools to an external repository making it possible to remove
this and the android_common dependency from Bazel. But since the
migration is not imminent, this commit is the work around to unblock the
upgrade to JDK11.

RELNOTES: None
  • Loading branch information
meisterT committed Jan 28, 2019
1 parent bac30fe commit c4ac104
Show file tree
Hide file tree
Showing 5 changed files with 292 additions and 0 deletions.
4 changes: 4 additions & 0 deletions third_party/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ filegroup(
"//third_party/iossim:srcs",
"//third_party/grpc:srcs",
"//third_party/jarjar:srcs",
"//third_party/jaxb:srcs",
"//third_party/java/android_databinding:srcs",
"//third_party/java/aosp_gradle_core:srcs",
"//third_party/java/apkbuilder:srcs",
Expand Down Expand Up @@ -97,6 +98,9 @@ java_import(
"android_common/com.android.tools_sdk-common_25.0.0.jar",
"android_common/com.android.tools_sdklib_25.0.0.jar",
],
deps = [
"//third_party/jaxb",
],
runtime_deps = [
":asm",
":asm-analysis",
Expand Down
14 changes: 14 additions & 0 deletions third_party/jaxb/BUILD
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
licenses(["reciprocal"]) # CDDL License

package(default_visibility = ["//visibility:public"])

filegroup(
name = "srcs",
srcs = glob(["**"]),
)

java_import(
name = "jaxb",
jars = ["jaxb-api-2.3.1.jar"],
srcjar = "jaxb-api-2.3.1-sources.jar",
)
Loading

0 comments on commit c4ac104

Please sign in to comment.