Google Git
Sign in
bazel/bazel/7a833f4db68dc85c9efb7c9126a3ecb3a614fd74^!/.
commit
7a833f4db68dc85c9efb7c9126a3ecb3a614fd74
[log]
author
Han-Wen Nienhuys <hanwen@google.com>
Wed Oct 28 14:17:09 2015 +0000
committer
Dmitry Lomov <dslomov@google.com>
Wed Oct 28 16:05:41 2015 +0000
tree
a5ba26779c2e5bdd16aab9b820255d1534d2c1ac
parent
b655167905dfac773b09c3f53185d8269fb47077 [diff]
Split off more BUILD files.

--
MOS_MIGRATED_REVID=106493557

diff --git a/.gitignore b/.gitignore
index dc60d27..8e407e6 100644
--- a/.gitignore
+++ b/.gitignore

@@ -1,3 +1,4 @@
+*~
 /output/
 /bazel-bin
 /bazel-genfiles

diff --git a/src/BUILD b/src/BUILD
index ee73191..00c2cb3 100644
--- a/src/BUILD
+++ b/src/BUILD

@@ -18,7 +18,7 @@
 [genrule(
     name = "install_base_key-file" + suffix,
     srcs = [
-        "//src/main/java:bazel-main_deploy.jar",
+        "//src/main/java/com/google/devtools/build/lib:bazel-main_deploy.jar",
         "//src/main/cpp:client",
         ":libunix",
         "//src/main/tools:build-runfiles",
@@ -86,7 +86,7 @@
         # The script assumes that the embedded tools zip (if exists) is the
         # first item here, the deploy jar the second and install base key is the
         # third
-        "//src/main/java:bazel-main_deploy.jar",
+        "//src/main/java/com/google/devtools/build/lib:bazel-main_deploy.jar",
         "install_base_key" + suffix,
         "//src/main/cpp:client",
         ":libunix",

diff --git a/src/java_tools/buildjar/BUILD b/src/java_tools/buildjar/BUILD
index 3605266..3ebe0df 100644
--- a/src/java_tools/buildjar/BUILD
+++ b/src/java_tools/buildjar/BUILD

@@ -89,7 +89,7 @@
     srcs = ["java/com/google/devtools/build/java/bazel/JavaBuilderConfigGenerator.java"],
     main_class = "com.google.devtools.build.java.bazel.JavaBuilderConfigGenerator",
     deps = [
-        "//src/main/java:java-toolchain-parser",
+        "//src/main/java/com/google/devtools/build/lib:java-toolchain-parser",
         "//third_party:guava",
     ],
 )

diff --git a/src/java_tools/singlejar/BUILD b/src/java_tools/singlejar/BUILD
index b030367..78d7d51 100644
--- a/src/java_tools/singlejar/BUILD
+++ b/src/java_tools/singlejar/BUILD

@@ -11,7 +11,7 @@
     srcs = glob(["java/**/singlejar/**/*.java"]),
     deps = [
         ":zip",
-        "//src/main/java:shell",
+        "//src/main/java/com/google/devtools/build/lib:shell",
         "//third_party:jsr305",
     ],
 )
@@ -29,7 +29,7 @@
     deps = [
         ":libSingleJar",
         ":zip",
-        "//src/main/java:shell",
+        "//src/main/java/com/google/devtools/build/lib:shell",
         "//src/test/java:testutil",
         "//third_party:guava",
         "//third_party:jsr305",
@@ -81,6 +81,6 @@
     visibility = ["//visibility:public"],
     deps = [
         ":skylark-deps",
-        "//src/main/java:shell-skylark",
+        "//src/main/java/com/google/devtools/build/lib:shell-skylark",
     ],
 )

diff --git a/src/main/java/com/google/devtools/build/docgen/BUILD b/src/main/java/com/google/devtools/build/docgen/BUILD
index 372b976..399e7b0 100644
--- a/src/main/java/com/google/devtools/build/docgen/BUILD
+++ b/src/main/java/com/google/devtools/build/docgen/BUILD

@@ -6,11 +6,11 @@
         "**/*.java",
     ]),
     deps = [
-        "//src/main/java:analysis-exec-rules-skyframe",
-        "//src/main/java:common",
-        "//src/main/java:concurrent",
-        "//src/main/java:packages",
-        "//src/main/java:util",
+        "//src/main/java/com/google/devtools/build/lib:analysis-exec-rules-skyframe",
+        "//src/main/java/com/google/devtools/build/lib:common",
+        "//src/main/java/com/google/devtools/build/lib:concurrent",
+        "//src/main/java/com/google/devtools/build/lib:packages",
+        "//src/main/java/com/google/devtools/build/lib:util",
         "//third_party:apache_velocity",
         "//third_party:guava",
     ],
@@ -27,15 +27,15 @@
     ),
     resources = [":be-template_files"],
     exports = [
-        "//src/main/java:bazel-core",
+        "//src/main/java/com/google/devtools/build/lib:bazel-core",
     ],
     deps = [
-        "//src/main/java:analysis-exec-rules-skyframe",
-        "//src/main/java:bazel-core",
-        "//src/main/java:common",
-        "//src/main/java:concurrent",
-        "//src/main/java:packages",
-        "//src/main/java:util",
+        "//src/main/java/com/google/devtools/build/lib:analysis-exec-rules-skyframe",
+        "//src/main/java/com/google/devtools/build/lib:bazel-core",
+        "//src/main/java/com/google/devtools/build/lib:common",
+        "//src/main/java/com/google/devtools/build/lib:concurrent",
+        "//src/main/java/com/google/devtools/build/lib:packages",
+        "//src/main/java/com/google/devtools/build/lib:util",
         "//third_party:apache_velocity",
         "//third_party:guava",
         "//third_party:jsr305",
@@ -48,8 +48,8 @@
     main_class = "com.google.devtools.build.docgen.BuildEncyclopediaGenerator",
     deps = [
         ":docgen_javalib",
-        "//src/main/java:analysis-exec-rules-skyframe",
-        "//src/main/java:common",
+        "//src/main/java/com/google/devtools/build/lib:analysis-exec-rules-skyframe",
+        "//src/main/java/com/google/devtools/build/lib:common",
     ],
 )
 

diff --git a/src/main/java/BUILD b/src/main/java/com/google/devtools/build/lib/BUILD
similarity index 74%
rename from src/main/java/BUILD
rename to src/main/java/com/google/devtools/build/lib/BUILD
index a6a7ab3..bcb586c 100644
--- a/src/main/java/BUILD
+++ b/src/main/java/com/google/devtools/build/lib/BUILD

@@ -3,7 +3,7 @@
 java_library(
     name = "shell",
     srcs = glob([
-        "com/google/devtools/build/lib/shell/*.java",
+        "shell/*.java",
     ]),
     deps = ["//third_party:guava"],
 )
@@ -11,7 +11,7 @@
 java_library(
     name = "cmdline",
     srcs = glob([
-        "com/google/devtools/build/lib/cmdline/*.java",
+        "cmdline/*.java",
     ]),
     deps = [
         ":base-util",
@@ -28,7 +28,7 @@
 java_library(
     name = "collect",
     srcs = glob([
-        "com/google/devtools/build/lib/collect/**/*.java",
+        "collect/**/*.java",
     ]),
     deps = [
         ":common",
@@ -41,7 +41,7 @@
 java_library(
     name = "common",
     srcs = [
-        "com/google/devtools/build/lib/Constants.java",
+        "Constants.java",
     ],
     deps = [
         "//third_party:guava",
@@ -52,7 +52,7 @@
 java_library(
     name = "concurrent",
     srcs = glob([
-        "com/google/devtools/build/lib/concurrent/*.java",
+        "concurrent/*.java",
     ]),
     deps = [
         ":common",
@@ -64,7 +64,7 @@
 java_library(
     name = "events",
     srcs = glob([
-        "com/google/devtools/build/lib/events/*.java",
+        "events/*.java",
     ]),
     deps = [
         ":common",
@@ -78,7 +78,7 @@
 
 java_library(
     name = "syntax",
-    srcs = glob(["com/google/devtools/build/lib/syntax/*.java"]),
+    srcs = glob(["syntax/*.java"]),
     deps = [
         ":base-util",
         ":collect",
@@ -98,8 +98,8 @@
 java_library(
     name = "packages",
     srcs = glob([
-        "com/google/devtools/build/lib/packages/*.java",
-        "com/google/devtools/build/lib/pkgcache/*.java",
+        "packages/*.java",
+        "pkgcache/*.java",
     ]),
     exports = [
         ":cmdline",
@@ -124,9 +124,9 @@
 java_library(
     name = "unix",
     srcs = glob([
-        "com/google/devtools/build/lib/unix/*.java",
+        "unix/*.java",
     ]) + [
-        "com/google/devtools/build/lib/UnixJniLoader.java",
+        "UnixJniLoader.java",
     ],
     deps = [
         ":common",
@@ -139,8 +139,8 @@
 java_library(
     name = "vfs",
     srcs = glob([
-        "com/google/devtools/build/lib/vfs/**/*.java",
-        "com/google/devtools/build/lib/profiler/*.java",
+        "vfs/**/*.java",
+        "profiler/*.java",
     ]),
     deps = [
         ":base-util",
@@ -159,9 +159,9 @@
 java_library(
     name = "profiler-output",
     srcs = glob([
-        "com/google/devtools/build/lib/profiler/chart/*.java",
-        "com/google/devtools/build/lib/profiler/output/*.java",
-        "com/google/devtools/build/lib/profiler/statistics/*.java",
+        "profiler/chart/*.java",
+        "profiler/output/*.java",
+        "profiler/statistics/*.java",
     ]),
     deps = [
         ":collect",
@@ -177,9 +177,9 @@
 java_library(
     name = "clock",
     srcs = [
-        "com/google/devtools/build/lib/util/BlazeClock.java",
-        "com/google/devtools/build/lib/util/Clock.java",
-        "com/google/devtools/build/lib/util/JavaClock.java",
+        "util/BlazeClock.java",
+        "util/Clock.java",
+        "util/JavaClock.java",
     ],
     deps = [
         ":concurrent",
@@ -190,9 +190,9 @@
 java_library(
     name = "base-util",
     srcs = [
-        "com/google/devtools/build/lib/util/StringCanonicalizer.java",
-        "com/google/devtools/build/lib/util/StringTrie.java",
-        "com/google/devtools/build/lib/util/VarInt.java",
+        "util/StringCanonicalizer.java",
+        "util/StringTrie.java",
+        "util/VarInt.java",
     ],
     deps = [
         ":common",
@@ -203,7 +203,7 @@
 # I/O utilities.
 java_library(
     name = "io",
-    srcs = glob(["com/google/devtools/build/lib/util/io/*.java"]),
+    srcs = glob(["util/io/*.java"]),
     deps = [
         ":clock",
         ":common",
@@ -216,21 +216,21 @@
 # General utilities.
 java_library(
     name = "os_util",
-    srcs = ["com/google/devtools/build/lib/util/OS.java"],
+    srcs = ["util/OS.java"],
 )
 
 java_library(
     name = "util",
     srcs = glob(
-        ["com/google/devtools/build/lib/util/*.java"],
+        ["util/*.java"],
         exclude = [
-            "com/google/devtools/build/lib/util/BlazeClock.java",
-            "com/google/devtools/build/lib/util/Clock.java",
-            "com/google/devtools/build/lib/util/JavaClock.java",
-            "com/google/devtools/build/lib/util/OS.java",
-            "com/google/devtools/build/lib/util/StringCanonicalizer.java",
-            "com/google/devtools/build/lib/util/StringTrie.java",
-            "com/google/devtools/build/lib/util/VarInt.java",
+            "util/BlazeClock.java",
+            "util/Clock.java",
+            "util/JavaClock.java",
+            "util/OS.java",
+            "util/StringCanonicalizer.java",
+            "util/StringTrie.java",
+            "util/VarInt.java",
         ],
     ),
     deps = [
@@ -250,37 +250,20 @@
 )
 
 java_library(
-    name = "skyframe-base",
-    srcs = glob([
-        "com/google/devtools/build/skyframe/*.java",
-    ]),
-    deps = [
-        ":collect",
-        ":common",
-        ":concurrent",
-        ":events",
-        ":util",
-        ":vfs",
-        "//third_party:guava",
-        "//third_party:jsr305",
-    ],
-)
-
-java_library(
     name = "analysis-exec-rules-skyframe",
     srcs = glob(
         [
-            "com/google/devtools/build/lib/analysis/**/*.java",
-            "com/google/devtools/build/lib/exec/*.java",
-            "com/google/devtools/build/lib/ideinfo/**/*.java",
-            "com/google/devtools/build/lib/rules/**/*.java",
-            "com/google/devtools/build/lib/skyframe/*.java",
+            "analysis/**/*.java",
+            "exec/*.java",
+            "ideinfo/**/*.java",
+            "rules/**/*.java",
+            "skyframe/*.java",
         ],
         exclude = [
-            "com/google/devtools/build/lib/rules/java/JavaToolchainDataParser.java",
+            "rules/java/JavaToolchainDataParser.java",
         ],
     ) + [
-        "com/google/devtools/build/lib/runtime/BlazeServerStartupOptions.java",
+        "runtime/BlazeServerStartupOptions.java",
     ],
     deps = [
         ":base-util",
@@ -293,10 +276,10 @@
         ":os_util",
         ":packages",
         ":shell",
-        ":skyframe-base",
         ":util",
         ":vfs",
         "//src/main/java/com/google/devtools/build/lib/actions",
+        "//src/main/java/com/google/devtools/build/skyframe",
         "//src/main/java/com/google/devtools/common/options",
         "//src/main/protobuf:android_studio_ide_info_proto",
         "//src/main/protobuf:bundlemerge_proto",
@@ -316,7 +299,7 @@
 java_library(
     name = "graph",
     srcs = glob([
-        "com/google/devtools/build/lib/graph/*.java",
+        "graph/*.java",
     ]),
     deps = [
         "//third_party:guava",
@@ -327,7 +310,7 @@
 java_library(
     name = "query2",
     srcs = glob([
-        "com/google/devtools/build/lib/query2/**/*.java",
+        "query2/**/*.java",
     ]),
     deps = [
         ":analysis-exec-rules-skyframe",
@@ -337,9 +320,9 @@
         ":events",
         ":graph",
         ":packages",
-        ":skyframe-base",
         ":util",
         ":vfs",
+        "//src/main/java/com/google/devtools/build/skyframe",
         "//src/main/java/com/google/devtools/common/options",
         "//src/main/protobuf:build_proto",
         "//third_party:guava",
@@ -350,8 +333,8 @@
 java_library(
     name = "buildtool-runtime",
     srcs = glob([
-        "com/google/devtools/build/lib/buildtool/**/*.java",
-        "com/google/devtools/build/lib/runtime/**/*.java",
+        "buildtool/**/*.java",
+        "runtime/**/*.java",
     ]),
     deps = [
         ":analysis-exec-rules-skyframe",
@@ -367,11 +350,11 @@
         ":query2",
         ":server",
         ":shell",
-        ":skyframe-base",
         ":util",
         ":vfs",
         "//src/main/java/com/google/devtools/build/docgen",
         "//src/main/java/com/google/devtools/build/lib/actions",
+        "//src/main/java/com/google/devtools/build/skyframe",
         "//src/main/java/com/google/devtools/common/options",
         "//src/main/protobuf:build_proto",
         "//src/main/protobuf:invocation_policy_proto",
@@ -386,9 +369,9 @@
 java_library(
     name = "runtime",
     srcs = glob([
-        "com/google/devtools/build/lib/runtime/**/*.java",
-        "com/google/devtools/build/lib/buildtool/**/*.java",
-        "com/google/devtools/build/lib/server/**/*.java",
+        "runtime/**/*.java",
+        "buildtool/**/*.java",
+        "server/**/*.java",
     ]),
     deps = [
         ":analysis-exec-rules-skyframe",
@@ -404,12 +387,12 @@
         ":profiler-output",
         ":query2",
         ":shell",
-        ":skyframe-base",
         ":unix",
         ":util",
         ":vfs",
         "//src/main/java/com/google/devtools/build/docgen",
         "//src/main/java/com/google/devtools/build/lib/actions",
+        "//src/main/java/com/google/devtools/build/skyframe",
         "//src/main/java/com/google/devtools/common/options",
         "//src/main/protobuf:build_proto",
         "//src/main/protobuf:invocation_policy_proto",
@@ -424,7 +407,7 @@
 java_library(
     name = "server",
     srcs = glob([
-        "com/google/devtools/build/lib/server/**/*.java",
+        "server/**/*.java",
     ]),
     deps = [
         ":clock",
@@ -441,19 +424,19 @@
     name = "bazel-core",
     srcs = glob(
         [
-            "com/google/devtools/build/lib/bazel/**/*.java",
+            "bazel/**/*.java",
         ],
         exclude = [
-            "com/google/devtools/build/lib/bazel/repository/MavenConnector.java",
+            "bazel/repository/MavenConnector.java",
         ],
     ),
     resources = glob([
-        "com/google/devtools/build/lib/**/*.txt",
-        "com/google/devtools/build/lib/**/*.html",
-        "com/google/devtools/build/lib/**/*.css",
-        "com/google/devtools/build/lib/**/*.js",
-        "com/google/devtools/build/lib/**/*.WORKSPACE",
-        "com/google/devtools/build/lib/**/*.vm",
+        "**/*.txt",
+        "**/*.html",
+        "**/*.css",
+        "**/*.js",
+        "**/*.WORKSPACE",
+        "**/*.vm",
     ]) + [
         "//third_party:d3-js",
         "//third_party:jquery",
@@ -490,7 +473,6 @@
         ":query2",
         ":runtime",
         ":shell",
-        ":skyframe-base",
         ":unix",
         ":util",
         ":vfs",
@@ -501,6 +483,7 @@
         "//src/main/java/com/google/devtools/build/lib/sandbox",
         "//src/main/java/com/google/devtools/build/lib/standalone",
         "//src/main/java/com/google/devtools/build/lib/worker",
+        "//src/main/java/com/google/devtools/build/skyframe",
         "//src/main/java/com/google/devtools/common/options",
         "//src/main/protobuf:build_proto",
         "//src/main/protobuf:crosstool_config_proto",
@@ -526,7 +509,7 @@
 
 java_library(
     name = "maven-connector",
-    srcs = ["com/google/devtools/build/lib/bazel/repository/MavenConnector.java"],
+    srcs = ["bazel/repository/MavenConnector.java"],
     deps = [
         "//third_party:aether",
         "//third_party:jsr330_inject",
@@ -539,10 +522,10 @@
     testonly = 1,
     srcs = glob([
         # JavaToolchain parser
-        "com/google/devtools/build/lib/rules/java/JavaToolchainData.java",
-        "com/google/devtools/build/lib/rules/java/JavaToolchainDataParser.java",
+        "rules/java/JavaToolchainData.java",
+        "rules/java/JavaToolchainDataParser.java",
         # Concurrent stuff
-        "com/google/devtools/build/lib/concurrent/*.java",
+        "concurrent/*.java",
     ]),
     visibility = [
         "//src/java_tools/buildjar:__pkg__",
@@ -571,6 +554,7 @@
         "//src/main/java/com/google/devtools/common/options:srcs",
         "//src/main/java/com/google/devtools/build/lib/bazel/dash:srcs",
         "//src/main/java/com/google/devtools/build/lib/sandbox:srcs",
+        "//src/main/java/com/google/devtools/build/skyframe:srcs",
         "//src/main/java/com/google/devtools/build/lib/standalone:srcs",
         "//src/main/java/com/google/devtools/build/lib/worker:srcs",
         "//src/main/java/com/google/devtools/build/docgen:srcs",
@@ -580,7 +564,7 @@
 
 filegroup(
     name = "docs_embedded_in_sources",
-    srcs = glob(["com/google/devtools/build/lib/**/*.java"]),
+    srcs = glob(["**/*.java"]),
 )
 
 genrule(
@@ -616,6 +600,6 @@
 
 bootstrap_java_library(
     name = "shell-skylark",
-    srcs = glob(["com/google/devtools/build/lib/shell/*.java"]),
+    srcs = glob(["shell/*.java"]),
     jars = ["//third_party:guava"],
 )

diff --git a/src/main/java/com/google/devtools/build/lib/actions/BUILD b/src/main/java/com/google/devtools/build/lib/actions/BUILD
index 42ee579..d3e844e 100644
--- a/src/main/java/com/google/devtools/build/lib/actions/BUILD
+++ b/src/main/java/com/google/devtools/build/lib/actions/BUILD

@@ -6,18 +6,18 @@
         "**/*.java",
     ]),
     deps = [
-        "//src/main/java:base-util",
-        "//src/main/java:clock",
-        "//src/main/java:collect",
-        "//src/main/java:common",
-        "//src/main/java:concurrent",
-        "//src/main/java:events",
-        "//src/main/java:io",
-        "//src/main/java:packages",
-        "//src/main/java:shell",
-        "//src/main/java:skyframe-base",
-        "//src/main/java:util",
-        "//src/main/java:vfs",
+        "//src/main/java/com/google/devtools/build/lib:base-util",
+        "//src/main/java/com/google/devtools/build/lib:clock",
+        "//src/main/java/com/google/devtools/build/lib:collect",
+        "//src/main/java/com/google/devtools/build/lib:common",
+        "//src/main/java/com/google/devtools/build/lib:concurrent",
+        "//src/main/java/com/google/devtools/build/lib:events",
+        "//src/main/java/com/google/devtools/build/lib:io",
+        "//src/main/java/com/google/devtools/build/lib:packages",
+        "//src/main/java/com/google/devtools/build/lib:shell",
+        "//src/main/java/com/google/devtools/build/lib:util",
+        "//src/main/java/com/google/devtools/build/lib:vfs",
+        "//src/main/java/com/google/devtools/build/skyframe",
         "//src/main/java/com/google/devtools/common/options",
         "//src/main/protobuf:extra_actions_base_proto",
         "//third_party:guava",

diff --git a/src/main/java/com/google/devtools/build/lib/bazel/dash/BUILD b/src/main/java/com/google/devtools/build/lib/bazel/dash/BUILD
index bba5eb7..b83dfdd 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/dash/BUILD
+++ b/src/main/java/com/google/devtools/build/lib/bazel/dash/BUILD

@@ -1,21 +1,21 @@
 filegroup(
     name = "srcs",
     srcs = glob(["**"]),
-    visibility = ["//src/main/java:__pkg__"],
+    visibility = ["//src/main/java/com/google/devtools/build/lib:__pkg__"],
 )
 
 java_library(
     name = "dash",
     srcs = glob(["*.java"]),
     visibility = [
-        "//src/main/java:__pkg__",
+        "//src/main/java/com/google/devtools/build/lib:__pkg__",
     ],
     deps = [
-        "//src/main/java:analysis-exec-rules-skyframe",
-        "//src/main/java:events",
-        "//src/main/java:packages",
-        "//src/main/java:runtime",
-        "//src/main/java:vfs",
+        "//src/main/java/com/google/devtools/build/lib:analysis-exec-rules-skyframe",
+        "//src/main/java/com/google/devtools/build/lib:events",
+        "//src/main/java/com/google/devtools/build/lib:packages",
+        "//src/main/java/com/google/devtools/build/lib:runtime",
+        "//src/main/java/com/google/devtools/build/lib:vfs",
         "//src/main/java/com/google/devtools/common/options",
         "//src/main/protobuf:dash_proto",
         "//third_party:apache_httpclient",

diff --git a/src/main/java/com/google/devtools/build/lib/rules/genquery/BUILD b/src/main/java/com/google/devtools/build/lib/rules/genquery/BUILD
index 4b55976..bd46560 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/genquery/BUILD
+++ b/src/main/java/com/google/devtools/build/lib/rules/genquery/BUILD

@@ -6,19 +6,19 @@
         "*.java",
     ]),
     deps = [
-        "//src/main/java:analysis-exec-rules-skyframe",
-        "//src/main/java:collect",
-        "//src/main/java:common",
-        "//src/main/java:concurrent",
-        "//src/main/java:events",
-        "//src/main/java:graph",
-        "//src/main/java:packages",
-        "//src/main/java:query2",
-        "//src/main/java:shell",
-        "//src/main/java:skyframe-base",
-        "//src/main/java:util",
-        "//src/main/java:vfs",
+        "//src/main/java/com/google/devtools/build/lib:analysis-exec-rules-skyframe",
+        "//src/main/java/com/google/devtools/build/lib:collect",
+        "//src/main/java/com/google/devtools/build/lib:common",
+        "//src/main/java/com/google/devtools/build/lib:concurrent",
+        "//src/main/java/com/google/devtools/build/lib:events",
+        "//src/main/java/com/google/devtools/build/lib:graph",
+        "//src/main/java/com/google/devtools/build/lib:packages",
+        "//src/main/java/com/google/devtools/build/lib:query2",
+        "//src/main/java/com/google/devtools/build/lib:shell",
+        "//src/main/java/com/google/devtools/build/lib:util",
+        "//src/main/java/com/google/devtools/build/lib:vfs",
         "//src/main/java/com/google/devtools/build/lib/actions",
+        "//src/main/java/com/google/devtools/build/skyframe",
         "//src/main/java/com/google/devtools/common/options",
         "//src/main/protobuf:crosstool_config_proto",
         "//src/main/protobuf:extra_actions_base_proto",

diff --git a/src/main/java/com/google/devtools/build/lib/sandbox/BUILD b/src/main/java/com/google/devtools/build/lib/sandbox/BUILD
index f734ef3..69c72da 100644
--- a/src/main/java/com/google/devtools/build/lib/sandbox/BUILD
+++ b/src/main/java/com/google/devtools/build/lib/sandbox/BUILD

@@ -8,17 +8,17 @@
     name = "sandbox",
     srcs = glob(["*.java"]),
     deps = [
-        "//src/main/java:analysis-exec-rules-skyframe",
-        "//src/main/java:buildtool-runtime",
-        "//src/main/java:common",
-        "//src/main/java:events",
-        "//src/main/java:io",
-        "//src/main/java:os_util",
-        "//src/main/java:packages",
-        "//src/main/java:shell",
-        "//src/main/java:unix",
-        "//src/main/java:util",
-        "//src/main/java:vfs",
+        "//src/main/java/com/google/devtools/build/lib:analysis-exec-rules-skyframe",
+        "//src/main/java/com/google/devtools/build/lib:buildtool-runtime",
+        "//src/main/java/com/google/devtools/build/lib:common",
+        "//src/main/java/com/google/devtools/build/lib:events",
+        "//src/main/java/com/google/devtools/build/lib:io",
+        "//src/main/java/com/google/devtools/build/lib:os_util",
+        "//src/main/java/com/google/devtools/build/lib:packages",
+        "//src/main/java/com/google/devtools/build/lib:shell",
+        "//src/main/java/com/google/devtools/build/lib:unix",
+        "//src/main/java/com/google/devtools/build/lib:util",
+        "//src/main/java/com/google/devtools/build/lib:vfs",
         "//src/main/java/com/google/devtools/build/lib/actions",
         "//src/main/java/com/google/devtools/build/lib/standalone",
         "//src/main/java/com/google/devtools/common/options",

diff --git a/src/main/java/com/google/devtools/build/lib/standalone/BUILD b/src/main/java/com/google/devtools/build/lib/standalone/BUILD
index bc03435..ef1bc84 100644
--- a/src/main/java/com/google/devtools/build/lib/standalone/BUILD
+++ b/src/main/java/com/google/devtools/build/lib/standalone/BUILD

@@ -8,15 +8,15 @@
     name = "standalone",
     srcs = glob(["*.java"]),
     deps = [
-        "//src/main/java:analysis-exec-rules-skyframe",
-        "//src/main/java:buildtool-runtime",
-        "//src/main/java:common",
-        "//src/main/java:io",
-        "//src/main/java:os_util",
-        "//src/main/java:packages",
-        "//src/main/java:shell",
-        "//src/main/java:util",
-        "//src/main/java:vfs",
+        "//src/main/java/com/google/devtools/build/lib:analysis-exec-rules-skyframe",
+        "//src/main/java/com/google/devtools/build/lib:buildtool-runtime",
+        "//src/main/java/com/google/devtools/build/lib:common",
+        "//src/main/java/com/google/devtools/build/lib:io",
+        "//src/main/java/com/google/devtools/build/lib:os_util",
+        "//src/main/java/com/google/devtools/build/lib:packages",
+        "//src/main/java/com/google/devtools/build/lib:shell",
+        "//src/main/java/com/google/devtools/build/lib:util",
+        "//src/main/java/com/google/devtools/build/lib:vfs",
         "//src/main/java/com/google/devtools/build/lib/actions",
         "//third_party:guava",
     ],

diff --git a/src/main/java/com/google/devtools/build/lib/worker/BUILD b/src/main/java/com/google/devtools/build/lib/worker/BUILD
index a9b0b89..305a8b7 100644
--- a/src/main/java/com/google/devtools/build/lib/worker/BUILD
+++ b/src/main/java/com/google/devtools/build/lib/worker/BUILD

@@ -8,15 +8,15 @@
     name = "worker",
     srcs = glob(["*.java"]),
     deps = [
-        "//src/main/java:analysis-exec-rules-skyframe",
-        "//src/main/java:buildtool-runtime",
-        "//src/main/java:common",
-        "//src/main/java:concurrent",
-        "//src/main/java:events",
-        "//src/main/java:io",
-        "//src/main/java:packages",
-        "//src/main/java:util",
-        "//src/main/java:vfs",
+        "//src/main/java/com/google/devtools/build/lib:analysis-exec-rules-skyframe",
+        "//src/main/java/com/google/devtools/build/lib:buildtool-runtime",
+        "//src/main/java/com/google/devtools/build/lib:common",
+        "//src/main/java/com/google/devtools/build/lib:concurrent",
+        "//src/main/java/com/google/devtools/build/lib:events",
+        "//src/main/java/com/google/devtools/build/lib:io",
+        "//src/main/java/com/google/devtools/build/lib:packages",
+        "//src/main/java/com/google/devtools/build/lib:util",
+        "//src/main/java/com/google/devtools/build/lib:vfs",
         "//src/main/java/com/google/devtools/build/lib/actions",
         "//src/main/java/com/google/devtools/build/lib/standalone",
         "//src/main/java/com/google/devtools/common/options",

diff --git a/src/main/java/com/google/devtools/build/skyframe/BUILD b/src/main/java/com/google/devtools/build/skyframe/BUILD
new file mode 100644
index 0000000..b012eeb
--- /dev/null
+++ b/src/main/java/com/google/devtools/build/skyframe/BUILD

@@ -0,0 +1,25 @@
+package(
+    default_visibility = ["//src:__subpackages__"],
+)
+
+java_library(
+    name = "skyframe",
+    srcs = glob([
+        "*.java",
+    ]),
+    deps = [
+        "//src/main/java/com/google/devtools/build/lib:collect",
+        "//src/main/java/com/google/devtools/build/lib:common",
+        "//src/main/java/com/google/devtools/build/lib:concurrent",
+        "//src/main/java/com/google/devtools/build/lib:events",
+        "//src/main/java/com/google/devtools/build/lib:util",
+        "//src/main/java/com/google/devtools/build/lib:vfs",
+        "//third_party:guava",
+        "//third_party:jsr305",
+    ],
+)
+
+filegroup(
+    name = "srcs",
+    srcs = glob(["**"]),
+)

diff --git a/src/test/java/BUILD b/src/test/java/BUILD
index 7fbb173..44d93e6 100644
--- a/src/test/java/BUILD
+++ b/src/test/java/BUILD

@@ -15,17 +15,17 @@
     srcs = glob(["com/google/devtools/build/lib/testutil/*.java"]),
     visibility = ["//visibility:public"],
     deps = [
-        "//src/main/java:analysis-exec-rules-skyframe",
-        "//src/main/java:bazel-core",
-        "//src/main/java:clock",
-        "//src/main/java:collect",
-        "//src/main/java:concurrent",
-        "//src/main/java:events",
-        "//src/main/java:io",
-        "//src/main/java:os_util",
-        "//src/main/java:packages",
-        "//src/main/java:util",
-        "//src/main/java:vfs",
+        "//src/main/java/com/google/devtools/build/lib:analysis-exec-rules-skyframe",
+        "//src/main/java/com/google/devtools/build/lib:bazel-core",
+        "//src/main/java/com/google/devtools/build/lib:clock",
+        "//src/main/java/com/google/devtools/build/lib:collect",
+        "//src/main/java/com/google/devtools/build/lib:concurrent",
+        "//src/main/java/com/google/devtools/build/lib:events",
+        "//src/main/java/com/google/devtools/build/lib:io",
+        "//src/main/java/com/google/devtools/build/lib:os_util",
+        "//src/main/java/com/google/devtools/build/lib:packages",
+        "//src/main/java/com/google/devtools/build/lib:util",
+        "//src/main/java/com/google/devtools/build/lib:vfs",
         "//src/main/java/com/google/devtools/build/lib/actions",
         "//third_party:guava",
         "//third_party:guava-testlib",
@@ -45,19 +45,19 @@
         ":analysis_testutil",
         ":foundations_testutil",
         ":testutil",
-        "//src/main/java:analysis-exec-rules-skyframe",
-        "//src/main/java:bazel-core",
-        "//src/main/java:clock",
-        "//src/main/java:cmdline",
-        "//src/main/java:collect",
-        "//src/main/java:concurrent",
-        "//src/main/java:events",
-        "//src/main/java:io",
-        "//src/main/java:packages",
-        "//src/main/java:skyframe-base",
-        "//src/main/java:util",
-        "//src/main/java:vfs",
+        "//src/main/java/com/google/devtools/build/lib:analysis-exec-rules-skyframe",
+        "//src/main/java/com/google/devtools/build/lib:bazel-core",
+        "//src/main/java/com/google/devtools/build/lib:clock",
+        "//src/main/java/com/google/devtools/build/lib:cmdline",
+        "//src/main/java/com/google/devtools/build/lib:collect",
+        "//src/main/java/com/google/devtools/build/lib:concurrent",
+        "//src/main/java/com/google/devtools/build/lib:events",
+        "//src/main/java/com/google/devtools/build/lib:io",
+        "//src/main/java/com/google/devtools/build/lib:packages",
+        "//src/main/java/com/google/devtools/build/lib:util",
+        "//src/main/java/com/google/devtools/build/lib:vfs",
         "//src/main/java/com/google/devtools/build/lib/actions",
+        "//src/main/java/com/google/devtools/build/skyframe",
         "//third_party:guava",
         "//third_party:guava-testlib",
         "//third_party:jsr305",
@@ -79,20 +79,20 @@
         ":foundations_testutil",
         ":skyframe_testutil",
         ":testutil",
-        "//src/main/java:analysis-exec-rules-skyframe",
-        "//src/main/java:bazel-core",
-        "//src/main/java:buildtool-runtime",
-        "//src/main/java:clock",
-        "//src/main/java:cmdline",
-        "//src/main/java:collect",
-        "//src/main/java:concurrent",
-        "//src/main/java:events",
-        "//src/main/java:io",
-        "//src/main/java:packages",
-        "//src/main/java:skyframe-base",
-        "//src/main/java:util",
-        "//src/main/java:vfs",
+        "//src/main/java/com/google/devtools/build/lib:analysis-exec-rules-skyframe",
+        "//src/main/java/com/google/devtools/build/lib:bazel-core",
+        "//src/main/java/com/google/devtools/build/lib:buildtool-runtime",
+        "//src/main/java/com/google/devtools/build/lib:clock",
+        "//src/main/java/com/google/devtools/build/lib:cmdline",
+        "//src/main/java/com/google/devtools/build/lib:collect",
+        "//src/main/java/com/google/devtools/build/lib:concurrent",
+        "//src/main/java/com/google/devtools/build/lib:events",
+        "//src/main/java/com/google/devtools/build/lib:io",
+        "//src/main/java/com/google/devtools/build/lib:packages",
+        "//src/main/java/com/google/devtools/build/lib:util",
+        "//src/main/java/com/google/devtools/build/lib:vfs",
         "//src/main/java/com/google/devtools/build/lib/actions",
+        "//src/main/java/com/google/devtools/build/skyframe",
         "//third_party:guava",
         "//third_party:guava-testlib",
         "//third_party:jsr305",
@@ -129,15 +129,15 @@
     ],
     deps = [
         ":testutil",
-        "//src/main/java:bazel-core",
-        "//src/main/java:clock",
-        "//src/main/java:concurrent",
-        "//src/main/java:events",
-        "//src/main/java:io",
-        "//src/main/java:packages",
-        "//src/main/java:shell",
-        "//src/main/java:util",
-        "//src/main/java:vfs",
+        "//src/main/java/com/google/devtools/build/lib:bazel-core",
+        "//src/main/java/com/google/devtools/build/lib:clock",
+        "//src/main/java/com/google/devtools/build/lib:concurrent",
+        "//src/main/java/com/google/devtools/build/lib:events",
+        "//src/main/java/com/google/devtools/build/lib:io",
+        "//src/main/java/com/google/devtools/build/lib:packages",
+        "//src/main/java/com/google/devtools/build/lib:shell",
+        "//src/main/java/com/google/devtools/build/lib:util",
+        "//src/main/java/com/google/devtools/build/lib:vfs",
         "//third_party:guava",
         "//third_party:guava-testlib",
         "//third_party:junit4",
@@ -189,19 +189,19 @@
         ":foundations_testutil",
         ":test_runner",
         ":testutil",
-        "//src/main/java:base-util",
-        "//src/main/java:bazel-core",
-        "//src/main/java:clock",
-        "//src/main/java:collect",
-        "//src/main/java:concurrent",
-        "//src/main/java:events",
-        "//src/main/java:io",
-        "//src/main/java:os_util",
-        "//src/main/java:packages",
-        "//src/main/java:shell",
-        "//src/main/java:unix",
-        "//src/main/java:util",
-        "//src/main/java:vfs",
+        "//src/main/java/com/google/devtools/build/lib:base-util",
+        "//src/main/java/com/google/devtools/build/lib:bazel-core",
+        "//src/main/java/com/google/devtools/build/lib:clock",
+        "//src/main/java/com/google/devtools/build/lib:collect",
+        "//src/main/java/com/google/devtools/build/lib:concurrent",
+        "//src/main/java/com/google/devtools/build/lib:events",
+        "//src/main/java/com/google/devtools/build/lib:io",
+        "//src/main/java/com/google/devtools/build/lib:os_util",
+        "//src/main/java/com/google/devtools/build/lib:packages",
+        "//src/main/java/com/google/devtools/build/lib:shell",
+        "//src/main/java/com/google/devtools/build/lib:unix",
+        "//src/main/java/com/google/devtools/build/lib:util",
+        "//src/main/java/com/google/devtools/build/lib:vfs",
         "//src/main/java/com/google/devtools/common/options",
         "//third_party:guava",
         "//third_party:guava-testlib",
@@ -225,10 +225,10 @@
         ":foundations_testutil",
         ":test_runner",
         ":testutil",
-        "//src/main/java:bazel-core",
-        "//src/main/java:clock",
-        "//src/main/java:util",
-        "//src/main/java:vfs",
+        "//src/main/java/com/google/devtools/build/lib:bazel-core",
+        "//src/main/java/com/google/devtools/build/lib:clock",
+        "//src/main/java/com/google/devtools/build/lib:util",
+        "//src/main/java/com/google/devtools/build/lib:vfs",
         "//src/main/java/com/google/devtools/common/options",
         "//third_party:guava",
         "//third_party:guava-testlib",
@@ -246,17 +246,17 @@
         ":foundations_testutil",
         ":test_runner",
         ":testutil",
-        "//src/main/java:analysis-exec-rules-skyframe",
-        "//src/main/java:bazel-core",
-        "//src/main/java:clock",
-        "//src/main/java:concurrent",
-        "//src/main/java:events",
-        "//src/main/java:io",
-        "//src/main/java:packages",
-        "//src/main/java:skyframe-base",
-        "//src/main/java:util",
-        "//src/main/java:vfs",
+        "//src/main/java/com/google/devtools/build/lib:analysis-exec-rules-skyframe",
+        "//src/main/java/com/google/devtools/build/lib:bazel-core",
+        "//src/main/java/com/google/devtools/build/lib:clock",
+        "//src/main/java/com/google/devtools/build/lib:concurrent",
+        "//src/main/java/com/google/devtools/build/lib:events",
+        "//src/main/java/com/google/devtools/build/lib:io",
+        "//src/main/java/com/google/devtools/build/lib:packages",
+        "//src/main/java/com/google/devtools/build/lib:util",
+        "//src/main/java/com/google/devtools/build/lib:vfs",
         "//src/main/java/com/google/devtools/build/lib/actions",
+        "//src/main/java/com/google/devtools/build/skyframe",
         "//src/main/java/com/google/devtools/common/options",
         "//third_party:guava",
         "//third_party:guava-testlib",
@@ -278,15 +278,15 @@
         ":foundations_testutil",
         ":test_runner",
         ":testutil",
-        "//src/main/java:analysis-exec-rules-skyframe",
-        "//src/main/java:bazel-core",
-        "//src/main/java:clock",
-        "//src/main/java:collect",
-        "//src/main/java:concurrent",
-        "//src/main/java:events",
-        "//src/main/java:packages",
-        "//src/main/java:util",
-        "//src/main/java:vfs",
+        "//src/main/java/com/google/devtools/build/lib:analysis-exec-rules-skyframe",
+        "//src/main/java/com/google/devtools/build/lib:bazel-core",
+        "//src/main/java/com/google/devtools/build/lib:clock",
+        "//src/main/java/com/google/devtools/build/lib:collect",
+        "//src/main/java/com/google/devtools/build/lib:concurrent",
+        "//src/main/java/com/google/devtools/build/lib:events",
+        "//src/main/java/com/google/devtools/build/lib:packages",
+        "//src/main/java/com/google/devtools/build/lib:util",
+        "//src/main/java/com/google/devtools/build/lib:vfs",
         "//src/main/java/com/google/devtools/build/lib/actions",
         "//src/main/java/com/google/devtools/common/options",
         "//third_party:guava",
@@ -315,20 +315,20 @@
         ":foundations_testutil",
         ":packages_testutil",
         ":testutil",
-        "//src/main/java:analysis-exec-rules-skyframe",
-        "//src/main/java:bazel-core",
-        "//src/main/java:buildtool-runtime",
-        "//src/main/java:clock",
-        "//src/main/java:collect",
-        "//src/main/java:concurrent",
-        "//src/main/java:events",
-        "//src/main/java:io",
-        "//src/main/java:packages",
-        "//src/main/java:runtime",
-        "//src/main/java:skyframe-base",
-        "//src/main/java:util",
-        "//src/main/java:vfs",
+        "//src/main/java/com/google/devtools/build/lib:analysis-exec-rules-skyframe",
+        "//src/main/java/com/google/devtools/build/lib:bazel-core",
+        "//src/main/java/com/google/devtools/build/lib:buildtool-runtime",
+        "//src/main/java/com/google/devtools/build/lib:clock",
+        "//src/main/java/com/google/devtools/build/lib:collect",
+        "//src/main/java/com/google/devtools/build/lib:concurrent",
+        "//src/main/java/com/google/devtools/build/lib:events",
+        "//src/main/java/com/google/devtools/build/lib:io",
+        "//src/main/java/com/google/devtools/build/lib:packages",
+        "//src/main/java/com/google/devtools/build/lib:runtime",
+        "//src/main/java/com/google/devtools/build/lib:util",
+        "//src/main/java/com/google/devtools/build/lib:vfs",
         "//src/main/java/com/google/devtools/build/lib/actions",
+        "//src/main/java/com/google/devtools/build/skyframe",
         "//src/main/java/com/google/devtools/common/options",
         "//src/main/protobuf:extra_actions_base_proto",
         "//third_party:guava",
@@ -353,10 +353,10 @@
         ":foundations_testutil",
         ":test_runner",
         ":testutil",
-        "//src/main/java:analysis-exec-rules-skyframe",
-        "//src/main/java:bazel-core",
-        "//src/main/java:io",
-        "//src/main/java:vfs",
+        "//src/main/java/com/google/devtools/build/lib:analysis-exec-rules-skyframe",
+        "//src/main/java/com/google/devtools/build/lib:bazel-core",
+        "//src/main/java/com/google/devtools/build/lib:io",
+        "//src/main/java/com/google/devtools/build/lib:vfs",
         "//src/main/java/com/google/devtools/build/lib/actions",
         "//src/main/protobuf:extra_actions_base_proto",
         "//third_party:guava",
@@ -381,12 +381,12 @@
         ":foundations_testutil",
         ":test_runner",
         ":testutil",
-        "//src/main/java:analysis-exec-rules-skyframe",
-        "//src/main/java:bazel-core",
-        "//src/main/java:common",
-        "//src/main/java:packages",
-        "//src/main/java:util",
-        "//src/main/java:vfs",
+        "//src/main/java/com/google/devtools/build/lib:analysis-exec-rules-skyframe",
+        "//src/main/java/com/google/devtools/build/lib:bazel-core",
+        "//src/main/java/com/google/devtools/build/lib:common",
+        "//src/main/java/com/google/devtools/build/lib:packages",
+        "//src/main/java/com/google/devtools/build/lib:util",
+        "//src/main/java/com/google/devtools/build/lib:vfs",
         "//src/main/java/com/google/devtools/common/options",
         "//src/main/protobuf:extra_actions_base_proto",
         "//third_party:guava",
@@ -411,11 +411,11 @@
         ":foundations_testutil",
         ":test_runner",
         ":testutil",
-        "//src/main/java:analysis-exec-rules-skyframe",
-        "//src/main/java:bazel-core",
-        "//src/main/java:packages",
-        "//src/main/java:util",
-        "//src/main/java:vfs",
+        "//src/main/java/com/google/devtools/build/lib:analysis-exec-rules-skyframe",
+        "//src/main/java/com/google/devtools/build/lib:bazel-core",
+        "//src/main/java/com/google/devtools/build/lib:packages",
+        "//src/main/java/com/google/devtools/build/lib:util",
+        "//src/main/java/com/google/devtools/build/lib:vfs",
         "//third_party:guava",
         "//third_party:junit4",
         "//third_party:truth",
@@ -436,10 +436,10 @@
         ":packages_testutil",
         ":test_runner",
         ":testutil",
-        "//src/main/java:analysis-exec-rules-skyframe",
-        "//src/main/java:bazel-core",
-        "//src/main/java:packages",
-        "//src/main/java:vfs",
+        "//src/main/java/com/google/devtools/build/lib:analysis-exec-rules-skyframe",
+        "//src/main/java/com/google/devtools/build/lib:bazel-core",
+        "//src/main/java/com/google/devtools/build/lib:packages",
+        "//src/main/java/com/google/devtools/build/lib:vfs",
         "//third_party:guava",
         "//third_party:junit4",
         "//third_party:truth",
@@ -459,12 +459,12 @@
         ":foundations_testutil",
         ":test_runner",
         ":testutil",
-        "//src/main/java:analysis-exec-rules-skyframe",
-        "//src/main/java:bazel-core",
-        "//src/main/java:collect",
-        "//src/main/java:events",
-        "//src/main/java:packages",
-        "//src/main/java:vfs",
+        "//src/main/java/com/google/devtools/build/lib:analysis-exec-rules-skyframe",
+        "//src/main/java/com/google/devtools/build/lib:bazel-core",
+        "//src/main/java/com/google/devtools/build/lib:collect",
+        "//src/main/java/com/google/devtools/build/lib:events",
+        "//src/main/java/com/google/devtools/build/lib:packages",
+        "//src/main/java/com/google/devtools/build/lib:vfs",
         "//src/main/java/com/google/devtools/build/lib/actions",
         "//third_party:guava",
         "//third_party:guava-testlib",
@@ -483,15 +483,15 @@
     deps = [
         ":foundations_testutil",
         ":testutil",
-        "//src/main/java:analysis-exec-rules-skyframe",
-        "//src/main/java:bazel-core",
-        "//src/main/java:clock",
-        "//src/main/java:events",
-        "//src/main/java:io",
-        "//src/main/java:packages",
-        "//src/main/java:skyframe-base",
-        "//src/main/java:util",
-        "//src/main/java:vfs",
+        "//src/main/java/com/google/devtools/build/lib:analysis-exec-rules-skyframe",
+        "//src/main/java/com/google/devtools/build/lib:bazel-core",
+        "//src/main/java/com/google/devtools/build/lib:clock",
+        "//src/main/java/com/google/devtools/build/lib:events",
+        "//src/main/java/com/google/devtools/build/lib:io",
+        "//src/main/java/com/google/devtools/build/lib:packages",
+        "//src/main/java/com/google/devtools/build/lib:util",
+        "//src/main/java/com/google/devtools/build/lib:vfs",
+        "//src/main/java/com/google/devtools/build/skyframe",
         "//src/main/java/com/google/devtools/common/options",
         "//src/main/protobuf:extra_actions_base_proto",
         "//third_party:guava",
@@ -516,13 +516,13 @@
         ":packages_testutil",
         ":test_runner",
         ":testutil",
-        "//src/main/java:analysis-exec-rules-skyframe",
-        "//src/main/java:bazel-core",
-        "//src/main/java:events",
-        "//src/main/java:packages",
-        "//src/main/java:skyframe-base",
-        "//src/main/java:util",
-        "//src/main/java:vfs",
+        "//src/main/java/com/google/devtools/build/lib:analysis-exec-rules-skyframe",
+        "//src/main/java/com/google/devtools/build/lib:bazel-core",
+        "//src/main/java/com/google/devtools/build/lib:events",
+        "//src/main/java/com/google/devtools/build/lib:packages",
+        "//src/main/java/com/google/devtools/build/lib:util",
+        "//src/main/java/com/google/devtools/build/lib:vfs",
+        "//src/main/java/com/google/devtools/build/skyframe",
         "//src/main/protobuf:build_proto",
         "//third_party:guava",
         "//third_party:guava-testlib",
@@ -544,12 +544,12 @@
         ":foundations_testutil",
         ":test_runner",
         ":testutil",
-        "//src/main/java:analysis-exec-rules-skyframe",
-        "//src/main/java:bazel-core",
-        "//src/main/java:collect",
-        "//src/main/java:events",
-        "//src/main/java:packages",
-        "//src/main/java:vfs",
+        "//src/main/java/com/google/devtools/build/lib:analysis-exec-rules-skyframe",
+        "//src/main/java/com/google/devtools/build/lib:bazel-core",
+        "//src/main/java/com/google/devtools/build/lib:collect",
+        "//src/main/java/com/google/devtools/build/lib:events",
+        "//src/main/java/com/google/devtools/build/lib:packages",
+        "//src/main/java/com/google/devtools/build/lib:vfs",
         "//src/main/java/com/google/devtools/build/lib/actions",
         "//src/main/protobuf:android_studio_ide_info_proto",
         "//third_party:guava",
@@ -580,9 +580,9 @@
         ":foundations_testutil",
         ":test_runner",
         ":testutil",
-        "//src/main/java:bazel-core",
-        "//src/main/java:collect",
-        "//src/main/java:shell",
+        "//src/main/java/com/google/devtools/build/lib:bazel-core",
+        "//src/main/java/com/google/devtools/build/lib:collect",
+        "//src/main/java/com/google/devtools/build/lib:shell",
         "//third_party:guava",
         "//third_party:guava-testlib",
         "//third_party:jsr305",
@@ -597,10 +597,10 @@
     srcs = ["com/google/devtools/build/lib/syntax/SkylarkShell.java"],
     main_class = "com.google.devtools.build.lib.syntax.SkylarkShell",
     deps = [
-        "//src/main/java:analysis-exec-rules-skyframe",
-        "//src/main/java:bazel-core",
-        "//src/main/java:events",
-        "//src/main/java:packages",
+        "//src/main/java/com/google/devtools/build/lib:analysis-exec-rules-skyframe",
+        "//src/main/java/com/google/devtools/build/lib:bazel-core",
+        "//src/main/java/com/google/devtools/build/lib:events",
+        "//src/main/java/com/google/devtools/build/lib:packages",
     ],
 )
 
@@ -615,14 +615,14 @@
         ":syntax_testutil",
         ":test_runner",
         ":testutil",
-        "//src/main/java:analysis-exec-rules-skyframe",
-        "//src/main/java:bazel-core",
-        "//src/main/java:collect",
-        "//src/main/java:concurrent",
-        "//src/main/java:events",
-        "//src/main/java:packages",
-        "//src/main/java:util",
-        "//src/main/java:vfs",
+        "//src/main/java/com/google/devtools/build/lib:analysis-exec-rules-skyframe",
+        "//src/main/java/com/google/devtools/build/lib:bazel-core",
+        "//src/main/java/com/google/devtools/build/lib:collect",
+        "//src/main/java/com/google/devtools/build/lib:concurrent",
+        "//src/main/java/com/google/devtools/build/lib:events",
+        "//src/main/java/com/google/devtools/build/lib:packages",
+        "//src/main/java/com/google/devtools/build/lib:util",
+        "//src/main/java/com/google/devtools/build/lib:vfs",
         "//src/main/java/com/google/devtools/build/lib/actions",
         "//third_party:guava",
         "//third_party:guava-testlib",
@@ -641,14 +641,14 @@
         ":foundations_testutil",
         ":test_runner",
         ":testutil",
-        "//src/main/java:analysis-exec-rules-skyframe",
-        "//src/main/java:bazel-core",
-        "//src/main/java:collect",
-        "//src/main/java:concurrent",
-        "//src/main/java:events",
-        "//src/main/java:packages",
-        "//src/main/java:util",
-        "//src/main/java:vfs",
+        "//src/main/java/com/google/devtools/build/lib:analysis-exec-rules-skyframe",
+        "//src/main/java/com/google/devtools/build/lib:bazel-core",
+        "//src/main/java/com/google/devtools/build/lib:collect",
+        "//src/main/java/com/google/devtools/build/lib:concurrent",
+        "//src/main/java/com/google/devtools/build/lib:events",
+        "//src/main/java/com/google/devtools/build/lib:packages",
+        "//src/main/java/com/google/devtools/build/lib:util",
+        "//src/main/java/com/google/devtools/build/lib:vfs",
         "//src/main/java/com/google/devtools/build/lib/actions",
         "//third_party:guava",
         "//third_party:guava-testlib",
@@ -668,13 +668,13 @@
         ":foundations_testutil",
         ":syntax_testutil",
         ":testutil",
-        "//src/main/java:analysis-exec-rules-skyframe",
-        "//src/main/java:bazel-core",
-        "//src/main/java:collect",
-        "//src/main/java:concurrent",
-        "//src/main/java:events",
-        "//src/main/java:packages",
-        "//src/main/java:vfs",
+        "//src/main/java/com/google/devtools/build/lib:analysis-exec-rules-skyframe",
+        "//src/main/java/com/google/devtools/build/lib:bazel-core",
+        "//src/main/java/com/google/devtools/build/lib:collect",
+        "//src/main/java/com/google/devtools/build/lib:concurrent",
+        "//src/main/java/com/google/devtools/build/lib:events",
+        "//src/main/java/com/google/devtools/build/lib:packages",
+        "//src/main/java/com/google/devtools/build/lib:vfs",
         "//src/main/java/com/google/devtools/build/lib/actions",
         "//third_party:guava",
         "//third_party:guava-testlib",
@@ -697,16 +697,16 @@
         ":skylark_testutil",
         ":test_runner",
         ":testutil",
-        "//src/main/java:analysis-exec-rules-skyframe",
-        "//src/main/java:bazel-core",
-        "//src/main/java:collect",
-        "//src/main/java:concurrent",
-        "//src/main/java:events",
-        "//src/main/java:packages",
-        "//src/main/java:skyframe-base",
-        "//src/main/java:util",
-        "//src/main/java:vfs",
+        "//src/main/java/com/google/devtools/build/lib:analysis-exec-rules-skyframe",
+        "//src/main/java/com/google/devtools/build/lib:bazel-core",
+        "//src/main/java/com/google/devtools/build/lib:collect",
+        "//src/main/java/com/google/devtools/build/lib:concurrent",
+        "//src/main/java/com/google/devtools/build/lib:events",
+        "//src/main/java/com/google/devtools/build/lib:packages",
+        "//src/main/java/com/google/devtools/build/lib:util",
+        "//src/main/java/com/google/devtools/build/lib:vfs",
         "//src/main/java/com/google/devtools/build/lib/actions",
+        "//src/main/java/com/google/devtools/build/skyframe",
         "//third_party:guava",
         "//third_party:guava-testlib",
         "//third_party:jsr305",
@@ -740,10 +740,10 @@
         ":actions_testutil",
         ":analysis_testutil",
         ":testutil",
-        "//src/main/java:analysis-exec-rules-skyframe",
-        "//src/main/java:bazel-core",
-        "//src/main/java:util",
-        "//src/main/java:vfs",
+        "//src/main/java/com/google/devtools/build/lib:analysis-exec-rules-skyframe",
+        "//src/main/java/com/google/devtools/build/lib:bazel-core",
+        "//src/main/java/com/google/devtools/build/lib:util",
+        "//src/main/java/com/google/devtools/build/lib:vfs",
         "//third_party:guava",
         "//third_party:guava-testlib",
         "//third_party:jsr305",
@@ -761,9 +761,9 @@
         ":actions_testutil",
         ":analysis_testutil",
         ":testutil",
-        "//src/main/java:analysis-exec-rules-skyframe",
-        "//src/main/java:bazel-core",
-        "//src/main/java:vfs",
+        "//src/main/java/com/google/devtools/build/lib:analysis-exec-rules-skyframe",
+        "//src/main/java/com/google/devtools/build/lib:bazel-core",
+        "//src/main/java/com/google/devtools/build/lib:vfs",
         "//third_party:guava",
         "//third_party:guava-testlib",
         "//third_party:jsr305",
@@ -783,9 +783,9 @@
         ":foundations_testutil",
         ":test_runner",
         ":testutil",
-        "//src/main/java:bazel-core",
-        "//src/main/java:collect",
-        "//src/main/java:vfs",
+        "//src/main/java/com/google/devtools/build/lib:bazel-core",
+        "//src/main/java/com/google/devtools/build/lib:collect",
+        "//src/main/java/com/google/devtools/build/lib:vfs",
         "//third_party:guava",
         "//third_party:guava-testlib",
         "//third_party:jsr305",
@@ -802,13 +802,13 @@
         ":foundations_testutil",
         ":test_runner",
         ":testutil",
-        "//src/main/java:analysis-exec-rules-skyframe",
-        "//src/main/java:buildtool-runtime",
-        "//src/main/java:clock",
-        "//src/main/java:io",
-        "//src/main/java:packages",
-        "//src/main/java:util",
-        "//src/main/java:vfs",
+        "//src/main/java/com/google/devtools/build/lib:analysis-exec-rules-skyframe",
+        "//src/main/java/com/google/devtools/build/lib:buildtool-runtime",
+        "//src/main/java/com/google/devtools/build/lib:clock",
+        "//src/main/java/com/google/devtools/build/lib:io",
+        "//src/main/java/com/google/devtools/build/lib:packages",
+        "//src/main/java/com/google/devtools/build/lib:util",
+        "//src/main/java/com/google/devtools/build/lib:vfs",
         "//src/main/java/com/google/devtools/common/options",
         "//src/main/protobuf:invocation_policy_proto",
         "//src/main/protobuf:test_status_proto",
@@ -829,13 +829,13 @@
         ":analysis_testutil",
         ":foundations_testutil",
         ":testutil",
-        "//src/main/java:analysis-exec-rules-skyframe",
-        "//src/main/java:clock",
-        "//src/main/java:events",
-        "//src/main/java:os_util",
-        "//src/main/java:shell",
-        "//src/main/java:util",
-        "//src/main/java:vfs",
+        "//src/main/java/com/google/devtools/build/lib:analysis-exec-rules-skyframe",
+        "//src/main/java/com/google/devtools/build/lib:clock",
+        "//src/main/java/com/google/devtools/build/lib:events",
+        "//src/main/java/com/google/devtools/build/lib:os_util",
+        "//src/main/java/com/google/devtools/build/lib:shell",
+        "//src/main/java/com/google/devtools/build/lib:util",
+        "//src/main/java/com/google/devtools/build/lib:vfs",
         "//src/main/java/com/google/devtools/build/lib/actions",
         "//src/main/java/com/google/devtools/build/lib/sandbox",
         "//src/main/java/com/google/devtools/common/options",

diff --git a/src/test/shell/bazel/BUILD b/src/test/shell/bazel/BUILD
index 85df323..4c7a318 100644
--- a/src/test/shell/bazel/BUILD
+++ b/src/test/shell/bazel/BUILD

@@ -123,7 +123,7 @@
     srcs = [
         "//src/java_tools/singlejar:srcs",
         "//src/main/protobuf:srcs",
-        "//src/main/java:srcs",
+        "//src/main/java/com/google/devtools/build/lib:srcs",
         "//src/main/java/com/google/devtools/build/lib/actions:srcs",
         "//src/main/java/com/google/devtools/build/lib/sandbox:srcs",
         "//src/main/java/com/google/devtools/build/lib/rules/genquery:srcs",

diff --git a/src/test/shell/bazel/bazel_docgen_test.sh b/src/test/shell/bazel/bazel_docgen_test.sh
index 3a9d0b1..c04ec5e 100755
--- a/src/test/shell/bazel/bazel_docgen_test.sh
+++ b/src/test/shell/bazel/bazel_docgen_test.sh

@@ -23,7 +23,7 @@
 
 function test_docgen() {
   unzip -q -n ${bazel_tree}
-  bazel build src/main/java:gen_buildencyclopedia &> $TEST_log || \
+  bazel build src/main/java/com/google/devtools/build/lib:gen_buildencyclopedia &> $TEST_log || \
     fail "Unexpected error generating build encyclopedia"
 }
 

diff --git a/src/tools/generate_workspace/src/main/java/com/google/devtools/build/workspace/BUILD b/src/tools/generate_workspace/src/main/java/com/google/devtools/build/workspace/BUILD
index 16a647f..f378973 100644
--- a/src/tools/generate_workspace/src/main/java/com/google/devtools/build/workspace/BUILD
+++ b/src/tools/generate_workspace/src/main/java/com/google/devtools/build/workspace/BUILD

@@ -3,13 +3,13 @@
     srcs = glob(["*.java"]),
     visibility = ["//src/tools/generate_workspace:__pkg__"],
     deps = [
-        "//src/main/java:analysis-exec-rules-skyframe",
-        "//src/main/java:bazel-core",
-        "//src/main/java:buildtool-runtime",
-        "//src/main/java:events",
-        "//src/main/java:os_util",
-        "//src/main/java:packages",
-        "//src/main/java:vfs",
+        "//src/main/java/com/google/devtools/build/lib:analysis-exec-rules-skyframe",
+        "//src/main/java/com/google/devtools/build/lib:bazel-core",
+        "//src/main/java/com/google/devtools/build/lib:buildtool-runtime",
+        "//src/main/java/com/google/devtools/build/lib:events",
+        "//src/main/java/com/google/devtools/build/lib:os_util",
+        "//src/main/java/com/google/devtools/build/lib:packages",
+        "//src/main/java/com/google/devtools/build/lib:vfs",
         "//src/main/java/com/google/devtools/common/options",
         "//src/tools/generate_workspace/src/main/java/com/google/devtools/build/workspace/maven",
         "//src/tools/generate_workspace/src/main/java/com/google/devtools/build/workspace/maven:rule",

diff --git a/src/tools/generate_workspace/src/main/java/com/google/devtools/build/workspace/maven/BUILD b/src/tools/generate_workspace/src/main/java/com/google/devtools/build/workspace/maven/BUILD
index b7dc566..7b88881 100644
--- a/src/tools/generate_workspace/src/main/java/com/google/devtools/build/workspace/maven/BUILD
+++ b/src/tools/generate_workspace/src/main/java/com/google/devtools/build/workspace/maven/BUILD

@@ -15,8 +15,8 @@
     ],
     deps = [
         ":rule",
-        "//src/main/java:events",
-        "//src/main/java:maven-connector",
+        "//src/main/java/com/google/devtools/build/lib:events",
+        "//src/main/java/com/google/devtools/build/lib:maven-connector",
         "//third_party:guava",
         "//third_party:jsr305",
         "//third_party:maven_model",
@@ -31,8 +31,8 @@
         "//src/tools/generate_workspace/src/main/java/com/google/devtools/build/workspace:__pkg__",
     ],
     deps = [
-        "//src/main/java:events",
-        "//src/main/java:maven-connector",
+        "//src/main/java/com/google/devtools/build/lib:events",
+        "//src/main/java/com/google/devtools/build/lib:maven-connector",
         "//third_party:aether",
         "//third_party:guava",
         "//third_party:maven_model",