diff options
| author |  Laszlo Csomor <laszlocsomor@google.com> | 2018-08-09 01:28:40 -0700 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-08-09 01:30:42 -0700 |
| commit | 5a7c847e98428f873c6c426ebfd99a91f9295593 (patch) | |
| tree | 76e744bcc5cffc4e75458d341604f29e06ef8db0 /src | |
| parent | d215b64362c4ede61c8ba87b5f3f57bce4785d15 (diff) | |
Java: add @bazel_tools//tools/java/runfiles
See https://github.com/bazelbuild/bazel/issues/5803
Change-Id: I49a2e744af667d34aedc3384629acd48641b0921
Closes #5804.
Change-Id: I75f85f02384fd1d9f6ebac5fff7c96c7278f7cdd
PiperOrigin-RevId: 208010815
Diffstat (limited to 'src')
5 files changed, 12 insertions, 5 deletions
diff --git a/src/test/py/bazel/testdata/runfiles_test/bar/BUILD.mock b/src/test/py/bazel/testdata/runfiles_test/bar/BUILD.mock index 930884b45a..de3a5cf9d0 100644 --- a/src/test/py/bazel/testdata/runfiles_test/bar/BUILD.mock +++ b/src/test/py/bazel/testdata/runfiles_test/bar/BUILD.mock @@ -13,7 +13,7 @@ java_binary( srcs = ["Bar.java"], data = ["bar-java-data.txt"], main_class = "Bar", - deps = ["@bazel_tools//tools/runfiles:java-runfiles"], + deps = ["@bazel_tools//tools/java/runfiles"], ) sh_binary( diff --git a/src/test/py/bazel/testdata/runfiles_test/foo/BUILD.mock b/src/test/py/bazel/testdata/runfiles_test/foo/BUILD.mock index 42c7d84241..533a7d7243 100644 --- a/src/test/py/bazel/testdata/runfiles_test/foo/BUILD.mock +++ b/src/test/py/bazel/testdata/runfiles_test/foo/BUILD.mock @@ -23,7 +23,7 @@ java_binary( "//bar:bar-cc", ], main_class = "Foo", - deps = ["@bazel_tools//tools/runfiles:java-runfiles"], + deps = ["@bazel_tools//tools/java/runfiles"], ) sh_binary( diff --git a/src/tools/runfiles/java/com/google/devtools/build/runfiles/BUILD b/src/tools/runfiles/java/com/google/devtools/build/runfiles/BUILD index 00f44a07d6..c988e82658 100644 --- a/src/tools/runfiles/java/com/google/devtools/build/runfiles/BUILD +++ b/src/tools/runfiles/java/com/google/devtools/build/runfiles/BUILD @@ -29,7 +29,6 @@ filegroup( java_library( name = "runfiles", srcs = [":java-srcs"], - visibility = ["//src/tools/runfiles:__pkg__"], ) java_test( diff --git a/src/tools/runfiles/java/com/google/devtools/build/runfiles/BUILD.tools b/src/tools/runfiles/java/com/google/devtools/build/runfiles/BUILD.tools index 5337b2b0d5..2f90f252ad 100644 --- a/src/tools/runfiles/java/com/google/devtools/build/runfiles/BUILD.tools +++ b/src/tools/runfiles/java/com/google/devtools/build/runfiles/BUILD.tools @@ -1,5 +1,6 @@ package(default_visibility = ["//visibility:private"]) +# TODO(laszlocsomor): move the sources to //tools/java/runfiles filegroup( name = "java-srcs", srcs = [ @@ -8,8 +9,15 @@ filegroup( ], ) +# TODO(laszlocsomor): after https://github.com/bazelbuild/bazel/issues/5802 is fixed, add a +# `deprecation` attribute to @bazel_tools//tools/runfiles:java-runfiles, advising users to depend on +# @bazel_tools//tools/java/runfiles instead. After a reasonable time (1-2 Bazel releases containing +# the deprecation warning) remove @bazel_tools//tools/runfiles:java-runfiles. java_library( name = "runfiles", srcs = [":java-srcs"], - visibility = ["//tools/runfiles:__pkg__"], + visibility = [ + "//tools/runfiles:__pkg__", + "//tools/java/runfiles:__pkg__", + ], ) diff --git a/src/tools/runfiles/java/com/google/devtools/build/runfiles/Runfiles.java b/src/tools/runfiles/java/com/google/devtools/build/runfiles/Runfiles.java index 3c9eef3a6b..718b67948d 100644 --- a/src/tools/runfiles/java/com/google/devtools/build/runfiles/Runfiles.java +++ b/src/tools/runfiles/java/com/google/devtools/build/runfiles/Runfiles.java @@ -35,7 +35,7 @@ import java.util.Map; * java_binary( * name = "my_binary", * ... - * deps = ["@bazel_tools//tools/runfiles:java-runfiles"], + * deps = ["@bazel_tools//tools/java/runfiles"], * ) * </pre> * |