5 files changed, 43 insertions, 2 deletions
diff --git a/tools/BUILD b/tools/BUILD
index c69f44e8f4..e1f4641629 100644
--- a/tools/BUILD
+++ b/tools/BUILD
@@ -19,6 +19,7 @@ filegroup(
         "//tools/build_defs/repo:srcs",
         "//tools/build_rules:srcs",
         "//tools/coverage:srcs",
+        "//tools/java:srcs",
         "//tools/jdk:srcs",
         "//tools/launcher:srcs",
         "//tools/def_parser:srcs",
@@ -57,6 +58,7 @@ filegroup(
         "//tools/cpp:srcs",
         "//tools/cpp/runfiles:embedded_tools",
         "//tools/genrule:srcs",
+        "//tools/java:embedded_tools",
         "//tools/j2objc:srcs",
         "//tools/jdk:package-srcs",
         "//tools/jdk:srcs",
diff --git a/tools/java/BUILD b/tools/java/BUILD
new file mode 100644
index 0000000000..fba8a23d34
--- /dev/null
+++ b/tools/java/BUILD
@@ -0,0 +1,16 @@
+package(default_visibility = ["//visibility:private"])
+
+filegroup(
+    name = "srcs",
+    srcs = [
+        "BUILD",
+        "//tools/java/runfiles:srcs",
+    ],
+    visibility = ["//tools:__pkg__"],
+)
+
+filegroup(
+    name = "embedded_tools",
+    srcs = ["//tools/java/runfiles:embedded_tools"],
+    visibility = ["//tools:__pkg__"],
+)
diff --git a/tools/java/runfiles/BUILD b/tools/java/runfiles/BUILD
new file mode 100644
index 0000000000..a0d2c018af
--- /dev/null
+++ b/tools/java/runfiles/BUILD
@@ -0,0 +1,16 @@
+package(default_visibility = ["//visibility:private"])
+
+filegroup(
+    name = "srcs",
+    srcs = [
+        "BUILD",
+        "BUILD.tools",
+    ],
+    visibility = ["//tools/java:__pkg__"],
+)
+
+filegroup(
+    name = "embedded_tools",
+    srcs = ["BUILD.tools"],
+    visibility = ["//tools/java:__pkg__"],
+)
diff --git a/tools/java/runfiles/BUILD.tools b/tools/java/runfiles/BUILD.tools
new file mode 100644
index 0000000000..011a549ba3
--- /dev/null
+++ b/tools/java/runfiles/BUILD.tools
@@ -0,0 +1,6 @@
+alias(
+    name = "runfiles",
+    # TODO(laszlocsomor): move the sources to this package.
+    actual = "//src/tools/runfiles/java/com/google/devtools/build/runfiles",
+    visibility = ["//visibility:public"],
+)
diff --git a/tools/runfiles/BUILD.tools b/tools/runfiles/BUILD.tools
index d92852377b..6f107ea3e7 100644
--- a/tools/runfiles/BUILD.tools
+++ b/tools/runfiles/BUILD.tools
@@ -1,6 +1,7 @@
 package(default_visibility = ["//visibility:public"])
 
-alias(
+java_library(
     name = "java-runfiles",
-    actual = "//src/tools/runfiles/java/com/google/devtools/build/runfiles",
+    exports = ["//src/tools/runfiles/java/com/google/devtools/build/runfiles"],
+    deprecation = "Depend on @bazel_tools//tools/java/runfiles instead. This target goes away in Bazel release 0.18.0",
 )