Reorganize BUILD files.

--
MOS_MIGRATED_REVID=108985661

1 files changed, 35 insertions, 11 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/query2/BUILD b/src/main/java/com/google/devtools/build/lib/query2/BUILD
index 641eedaa4f..306ef7ad65 100644
--- a/src/main/java/com/google/devtools/build/lib/query2/BUILD
+++ b/src/main/java/com/google/devtools/build/lib/query2/BUILD
@@ -1,28 +1,52 @@
 package(
-    default_visibility = [
-        "//src:__subpackages__",
-    ],
+    default_visibility = ["//src:__subpackages__"],
 )
 
 java_library(
     name = "query2",
-    srcs = glob([
-        "**/*.java",
-    ]),
+    srcs = glob(["*.java"]),
     deps = [
-        "//src/main/java/com/google/devtools/build/lib:analysis-exec-rules-skyframe",
-        "//src/main/java/com/google/devtools/build/lib:collect",
+        ":query-engine",
+        "//src/main/java/com/google/devtools/build/lib:build-base",
         "//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:packages-internal",
         "//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",
+        "//third_party:jsr305",
+    ],
+)
+
+java_library(
+    name = "query-output",
+    srcs = glob(["output/*.java"]),
+    deps = [
+        ":query-engine",
+        ":query2",
+        "//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:events",
+        "//src/main/java/com/google/devtools/build/lib:graph",
+        "//src/main/java/com/google/devtools/build/lib:packages-internal",
+        "//src/main/java/com/google/devtools/build/lib:util",
         "//src/main/java/com/google/devtools/common/options",
-        "//src/main/protobuf:build_proto",
-        "//third_party:guava",
+        "//src/main/protobuf:build_proto_v2",
+        "//third_party:jsr305",
+    ],
+)
+
+# Query library.
+java_library(
+    name = "query-engine",
+    srcs = glob(["engine/*.java"]),
+    deps = [
+        "//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:graph",
+        "//src/main/java/com/google/devtools/build/lib:util",
         "//third_party:jsr305",
     ],
 )