Skip to content
This repository has been archived by the owner on Jan 11, 2024. It is now read-only.

Commit

Permalink
Migrate off versioned javac and Error Prone targets
Browse files Browse the repository at this point in the history 
Change-Id: Iad1e07ad55d5304d7c3dbb8bdab856728a91432d
PiperOrigin-RevId: 155375893
  • Loading branch information
@cushon @kchodorow
cushon authored and kchodorow committed May 9, 2017
1 parent c964ad8 commit 38949b8
Show file tree
Hide file tree
Showing 12 changed files with 34 additions and 34 deletions.
2 changes: 1 addition & 1 deletion src/BUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ filegroup(
"//tools:embedded_tools_srcs",
"//third_party:gpl-srcs",
"//third_party/java/jarjar:embedded_tools_srcs",
"//third_party/java/jdk/langtools:test-srcs-9-dev-r4023-1",
"//third_party/java/jdk/langtools:test-srcs",
"//third_party/py/concurrent:srcs",
"//third_party/py/gflags:srcs",
"//src/java_tools/buildjar/java/com/google/devtools/build/buildjar/jarhelper:srcs",
Expand Down
2 changes: 1 addition & 1 deletion src/java_tools/buildjar/BUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ java_toolchain(
genclass = ["bootstrap_genclass_deploy.jar"],
ijar = ["//third_party/ijar"],
javabuilder = ["bootstrap_deploy.jar"],
javac = ["//third_party/java/jdk/langtools:javac_jar-9-dev-r4023-1"],
javac = ["//third_party/java/jdk/langtools:javac_jar"],
jvm_opts = [
"-XX:+TieredCompilation",
"-XX:TieredStopAtLevel=1",
Expand Down
10 changes: 5 additions & 5 deletions src/java_tools/buildjar/java/com/google/devtools/build/buildjar/BUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ java_library(
"//third_party:auto_value",
"//third_party:guava",
"//third_party:jsr305",
"//third_party/java/jdk/langtools:javac-9-dev-r4023-1",
"//third_party/java/jdk/langtools:javac",
],
)

Expand Down Expand Up @@ -71,7 +71,7 @@ java_library(
"//src/main/protobuf:worker_protocol_java_proto",
"//third_party:guava",
"//third_party/java/jacoco:core",
"//third_party/java/jdk/langtools:javac-9-dev-r4023-1",
"//third_party/java/jdk/langtools:javac",
],
)

Expand Down Expand Up @@ -130,12 +130,12 @@ bootstrap_java_library(
name = "skylark-deps",
jars = [
"//third_party:auto_value-jars",
"//third_party:bootstrap_guava_and_error_prone-jars-2.0.20-SNAPSHOT",
"//third_party:bootstrap_guava_and_error_prone-jars",
"//third_party:jsr305-jars",
"//third_party/protobuf:protobuf-jars",
"//third_party/java/jacoco:core-jars",
],
neverlink_jars = ["//third_party/java/jdk/langtools:javac_jar-9-dev-r4023-1"],
neverlink_jars = ["//third_party/java/jdk/langtools:javac_jar"],
srcjars = [
"//src/main/protobuf:deps_java_proto_srcjar",
"//src/main/protobuf:worker_protocol_java_proto_srcjar",
Expand Down Expand Up @@ -172,7 +172,7 @@ bootstrap_java_library(
jars = [
"//third_party:jsr305-jars",
"//third_party:auto_value-jars",
"//third_party:bootstrap_guava_and_error_prone-jars-2.0.20-SNAPSHOT",
"//third_party:bootstrap_guava_and_error_prone-jars",
],
)

Expand Down
10 changes: 5 additions & 5 deletions src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/plugins/BUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ java_library(
srcs = ["BlazeJavaCompilerPlugin.java"],
deps = [
"//src/java_tools/buildjar/java/com/google/devtools/build/buildjar:invalid_command_line_exception",
"//third_party/java/jdk/langtools:javac-9-dev-r4023-1",
"//third_party/java/jdk/langtools:javac",
],
)

Expand All @@ -28,7 +28,7 @@ java_library(
"//src/java_tools/buildjar/java/com/google/devtools/build/buildjar:JarOwner",
"//src/main/protobuf:deps_java_proto",
"//third_party:guava",
"//third_party/java/jdk/langtools:javac-9-dev-r4023-1",
"//third_party/java/jdk/langtools:javac",
],
)

Expand All @@ -38,9 +38,9 @@ java_library(
deps = [
":plugins",
"//src/java_tools/buildjar/java/com/google/devtools/build/buildjar:invalid_command_line_exception",
"//third_party:error_prone-2.0.20-SNAPSHOT",
"//third_party:error_prone",
"//third_party:guava",
"//third_party/java/jdk/langtools:javac-9-dev-r4023-1",
"//third_party/java/jdk/langtools:javac",
],
)

Expand All @@ -51,7 +51,7 @@ java_library(
":plugins",
"//src/main/protobuf:java_compilation_java_proto",
"//third_party:guava",
"//third_party/java/jdk/langtools:javac-9-dev-r4023-1",
"//third_party/java/jdk/langtools:javac",
],
)

Expand Down
6 changes: 3 additions & 3 deletions src/java_tools/buildjar/java/com/google/devtools/build/java/bazel/BUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ java_library(
# Exports the canonical javac jar location
genrule(
name = "java-langtools-location",
srcs = ["//third_party/java/jdk/langtools:javac_jar-9-dev-r4023-1"],
srcs = ["//third_party/java/jdk/langtools:javac_jar"],
outs = ["JavaLangtoolsLocation.java"],
cmd = "$(location java-langtools-location.sh) $@ $(GENDIR) io_bazel/ $(SRCS)",
tools = ["java-langtools-location.sh"],
Expand All @@ -49,7 +49,7 @@ java_library(
java_library(
name = "JavaLangtools",
srcs = ["JavaLangtools.java"],
data = ["//third_party/java/jdk/langtools:javac_jar-9-dev-r4023-1"],
data = ["//third_party/java/jdk/langtools:javac_jar"],
visibility = ["//visibility:public"],
deps = [":java-langtools-location-lib"],
)
Expand Down Expand Up @@ -102,7 +102,7 @@ java_library(
java_library(
name = "BazelJavaCompiler",
srcs = ["BazelJavaCompiler.java"],
data = ["//third_party/java/jdk/langtools:javac_jar-9-dev-r4023-1"],
data = ["//third_party/java/jdk/langtools:javac_jar"],
visibility = [
"//src:__subpackages__",
"//third_party/ijar:__subpackages__",
Expand Down
14 changes: 7 additions & 7 deletions src/java_tools/buildjar/java/com/google/devtools/build/java/turbine/javac/BUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ java_library(
"//third_party:guava",
"//third_party:jsr305",
"//third_party:turbine",
"//third_party/java/jdk/langtools:javac-9-dev-r4023-1",
"//third_party/java/jdk/langtools:javac",
],
)

Expand All @@ -31,7 +31,7 @@ java_library(
"//src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/plugins:dependency",
"//third_party:guava",
"//third_party:jsr305",
"//third_party/java/jdk/langtools:javac-9-dev-r4023-1",
"//third_party/java/jdk/langtools:javac",
],
)

Expand All @@ -41,7 +41,7 @@ java_library(
deps = [
"//third_party:guava",
"//third_party:jsr305",
"//third_party/java/jdk/langtools:javac-9-dev-r4023-1",
"//third_party/java/jdk/langtools:javac",
],
)

Expand All @@ -56,7 +56,7 @@ java_library(
"//third_party:guava",
"//third_party:jimfs",
"//third_party:jsr305",
"//third_party/java/jdk/langtools:javac-9-dev-r4023-1",
"//third_party/java/jdk/langtools:javac",
],
)

Expand All @@ -68,7 +68,7 @@ java_library(
":tree_pruner",
"//src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/plugins:dependency",
"//third_party:jsr305",
"//third_party/java/jdk/langtools:javac-9-dev-r4023-1",
"//third_party/java/jdk/langtools:javac",
],
)

Expand All @@ -77,7 +77,7 @@ java_library(
srcs = ["ZipUtil.java"],
deps = [
"//third_party:jsr305",
"//third_party/java/jdk/langtools:javac-9-dev-r4023-1",
"//third_party/java/jdk/langtools:javac",
],
)

Expand All @@ -87,7 +87,7 @@ java_library(
deps = [
"//third_party:guava",
"//third_party:jsr305",
"//third_party/java/jdk/langtools:javac-9-dev-r4023-1",
"//third_party/java/jdk/langtools:javac",
],
)

Expand Down
2 changes: 1 addition & 1 deletion src/java_tools/buildjar/javatests/com/google/devtools/build/buildjar/resourcejar/BUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ java_test(
"//third_party:guava",
"//third_party:junit4",
"//third_party:truth",
"//third_party/java/jdk/langtools:javac-9-dev-r4023-1",
"//third_party/java/jdk/langtools:javac",
],
)
4 changes: 2 additions & 2 deletions src/java_tools/buildjar/javatests/com/google/devtools/build/java/bazel/BUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ java_test(
size = "small",
srcs = ["BazelJavaCompilerTest.java"],
data = [
"//third_party/java/jdk/langtools:javac_jar-9-dev-r4023-1",
"//third_party/java/jdk/langtools:javac_jar",
],
jvm_flags = [
# Simulates how Bazel invokes JavaBuilder
"-Xbootclasspath/p:$(location //third_party/java/jdk/langtools:javac_jar-9-dev-r4023-1)",
"-Xbootclasspath/p:$(location //third_party/java/jdk/langtools:javac_jar)",
],
tags = ["jdk8"],
test_class = "com.google.devtools.build.java.bazel.BazelJavaCompilerTest",
Expand Down
8 changes: 4 additions & 4 deletions src/java_tools/buildjar/javatests/com/google/devtools/build/java/turbine/javac/BUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ java_test(
name = "JavacTurbineTest",
srcs = ["JavacTurbineTest.java"],
data = [
"//third_party/java/jdk/langtools:javac_jar-9-dev-r4023-1",
"//third_party/java/jdk/langtools:javac_jar",
],
jvm_flags = [
# Simulates how Bazel invokes turbine
"-Xbootclasspath/p:$(location //third_party/java/jdk/langtools:javac_jar-9-dev-r4023-1)",
"-Xbootclasspath/p:$(location //third_party/java/jdk/langtools:javac_jar)",
],
tags = ["jdk8"],
deps = [
Expand All @@ -25,7 +25,7 @@ java_test(
"//third_party:junit4",
"//third_party:truth",
"//third_party:turbine",
"//third_party/java/jdk/langtools:javac-9-dev-r4023-1",
"//third_party/java/jdk/langtools:javac",
],
)

Expand All @@ -45,6 +45,6 @@ java_test(
"//third_party:guava",
"//third_party:junit4",
"//third_party:truth",
"//third_party/java/jdk/langtools:javac-9-dev-r4023-1",
"//third_party/java/jdk/langtools:javac",
],
)
2 changes: 1 addition & 1 deletion src/main/java/com/google/devtools/build/lib/BUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1310,7 +1310,7 @@ load("//tools/build_rules:java_rules_skylark.bzl", "bootstrap_java_library")
bootstrap_java_library(
name = "shell-skylark",
srcs = glob(["shell/*.java"]),
jars = ["//third_party:bootstrap_guava_and_error_prone-jars-2.0.20-SNAPSHOT"],
jars = ["//third_party:bootstrap_guava_and_error_prone-jars"],
)

########################################################################
Expand Down
4 changes: 2 additions & 2 deletions src/test/shell/bazel/BUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ filegroup(
genrule(
name = "langtools-copy",
testonly = 1,
srcs = ["//third_party/java/jdk/langtools:javac_jar-9-dev-r4023-1"],
srcs = ["//third_party/java/jdk/langtools:javac_jar"],
outs = ["langtools.jar"],
cmd = "cp $< $@",
)
Expand All @@ -39,7 +39,7 @@ filegroup(
"//src/test/shell:testenv.sh",
"//third_party:srcs",
"//third_party/ijar",
"//third_party/java/jdk/langtools:test-srcs-9-dev-r4023-1",
"//third_party/java/jdk/langtools:test-srcs",
"//tools:srcs",
"@local_jdk//:bootclasspath",
# TODO(cushon): migrate to extclasspath and delete
Expand Down
4 changes: 2 additions & 2 deletions tools/jdk/BUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ alias(

filegroup(
name = "langtools",
srcs = ["//third_party/java/jdk/langtools:javac_jar-9-dev-r4023-1"],
srcs = ["//third_party/java/jdk/langtools:javac_jar"],
)

java_import(
Expand Down Expand Up @@ -143,7 +143,7 @@ java_toolchain(
header_compiler = ["@bazel_tools//tools/jdk:turbine"],
ijar = ["@bazel_tools//tools/jdk:ijar"],
javabuilder = ["@bazel_tools//tools/jdk:javabuilder"],
javac = ["//third_party/java/jdk/langtools:javac_jar-9-dev-r4023-1"],
javac = ["//third_party/java/jdk/langtools:javac_jar"],
javac_supports_workers = 1,
jvm_opts = [
"-XX:+TieredCompilation",
Expand Down

0 comments on commit 38949b8

Please sign in to comment.