Split off 2 BUILD files.

--
MOS_MIGRATED_REVID=105301167

2 files changed, 17 insertions, 12 deletions

diff --git a/src/test/java/BUILD b/src/test/java/BUILD
index 9d731380db..d7ab63f93d 100644
--- a/src/test/java/BUILD
+++ b/src/test/java/BUILD
@@ -15,7 +15,6 @@ java_library(
     srcs = glob(["com/google/devtools/build/lib/testutil/*.java"]),
     visibility = ["//visibility:public"],
     deps = [
-        "//src/main/java:actions",
         "//src/main/java:analysis-exec-rules-skyframe",
         "//src/main/java:bazel-core",
         "//src/main/java:clock",
@@ -27,6 +26,7 @@ java_library(
         "//src/main/java:packages",
         "//src/main/java:util",
         "//src/main/java:vfs",
+        "//src/main/java/com/google/devtools/build/lib/actions",
         "//third_party:guava",
         "//third_party:guava-testlib",
         "//third_party:junit4",
@@ -203,7 +203,6 @@ java_library(
         ":foundations_testutil",
         ":test_runner",
         ":testutil",
-        "//src/main/java:actions",
         "//src/main/java:analysis-exec-rules-skyframe",
         "//src/main/java:bazel-core",
         "//src/main/java:clock",
@@ -215,6 +214,7 @@ java_library(
         "//src/main/java:skyframe-base",
         "//src/main/java:util",
         "//src/main/java:vfs",
+        "//src/main/java/com/google/devtools/build/lib/actions",
         "//third_party:guava",
         "//third_party:guava-testlib",
         "//third_party:jsr305",
@@ -235,7 +235,6 @@ java_test(
         ":foundations_testutil",
         ":test_runner",
         ":testutil",
-        "//src/main/java:actions",
         "//src/main/java:analysis-exec-rules-skyframe",
         "//src/main/java:bazel-core",
         "//src/main/java:clock",
@@ -246,6 +245,7 @@ java_test(
         "//src/main/java:packages",
         "//src/main/java:util",
         "//src/main/java:vfs",
+        "//src/main/java/com/google/devtools/build/lib/actions",
         "//third_party:guava",
         "//third_party:guava-testlib",
         "//third_party:jsr305",
@@ -272,7 +272,6 @@ java_library(
         ":foundations_testutil",
         ":packages_testutil",
         ":testutil",
-        "//src/main/java:actions",
         "//src/main/java:analysis-exec-rules-skyframe",
         "//src/main/java:bazel-core",
         "//src/main/java:buildtool-runtime",
@@ -287,6 +286,7 @@ java_library(
         "//src/main/java:skyframe-base",
         "//src/main/java:util",
         "//src/main/java:vfs",
+        "//src/main/java/com/google/devtools/build/lib/actions",
         "//src/main/protobuf:extra_actions_base_proto",
         "//third_party:guava",
         "//third_party:guava-testlib",
@@ -310,11 +310,11 @@ java_test(
         ":foundations_testutil",
         ":test_runner",
         ":testutil",
-        "//src/main/java:actions",
         "//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/actions",
         "//src/main/protobuf:extra_actions_base_proto",
         "//third_party:guava",
         "//third_party:guava-testlib",
@@ -416,13 +416,13 @@ java_test(
         ":foundations_testutil",
         ":test_runner",
         ":testutil",
-        "//src/main/java:actions",
         "//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/actions",
         "//third_party:guava",
         "//third_party:guava-testlib",
         "//third_party:jsr305",
@@ -498,13 +498,13 @@ java_test(
         ":foundations_testutil",
         ":test_runner",
         ":testutil",
-        "//src/main/java:actions",
         "//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/actions",
         "//src/main/protobuf:android_studio_ide_info_proto",
         "//third_party:guava",
         "//third_party:guava-testlib",
@@ -569,7 +569,6 @@ java_test(
         ":syntax_testutil",
         ":test_runner",
         ":testutil",
-        "//src/main/java:actions",
         "//src/main/java:analysis-exec-rules-skyframe",
         "//src/main/java:bazel-core",
         "//src/main/java:collect",
@@ -578,6 +577,7 @@ java_test(
         "//src/main/java:packages",
         "//src/main/java:util",
         "//src/main/java:vfs",
+        "//src/main/java/com/google/devtools/build/lib/actions",
         "//third_party:guava",
         "//third_party:guava-testlib",
         "//third_party:jsr305",
@@ -595,7 +595,6 @@ java_library(
         ":foundations_testutil",
         ":test_runner",
         ":testutil",
-        "//src/main/java:actions",
         "//src/main/java:analysis-exec-rules-skyframe",
         "//src/main/java:bazel-core",
         "//src/main/java:collect",
@@ -604,6 +603,7 @@ java_library(
         "//src/main/java:packages",
         "//src/main/java:util",
         "//src/main/java:vfs",
+        "//src/main/java/com/google/devtools/build/lib/actions",
         "//third_party:guava",
         "//third_party:guava-testlib",
         "//third_party:jsr305",
@@ -622,7 +622,6 @@ java_library(
         ":foundations_testutil",
         ":syntax_testutil",
         ":testutil",
-        "//src/main/java:actions",
         "//src/main/java:analysis-exec-rules-skyframe",
         "//src/main/java:bazel-core",
         "//src/main/java:collect",
@@ -630,6 +629,7 @@ java_library(
         "//src/main/java:events",
         "//src/main/java:packages",
         "//src/main/java:vfs",
+        "//src/main/java/com/google/devtools/build/lib/actions",
         "//third_party:guava",
         "//third_party:guava-testlib",
         "//third_party:jsr305",
@@ -651,7 +651,6 @@ java_test(
         ":skylark_testutil",
         ":test_runner",
         ":testutil",
-        "//src/main/java:actions",
         "//src/main/java:analysis-exec-rules-skyframe",
         "//src/main/java:bazel-core",
         "//src/main/java:collect",
@@ -660,6 +659,7 @@ java_test(
         "//src/main/java:packages",
         "//src/main/java:util",
         "//src/main/java:vfs",
+        "//src/main/java/com/google/devtools/build/lib/actions",
         "//third_party:guava",
         "//third_party:guava-testlib",
         "//third_party:jsr305",
@@ -782,7 +782,6 @@ java_test(
         ":analysis_testutil",
         ":foundations_testutil",
         ":testutil",
-        "//src/main/java:actions",
         "//src/main/java:analysis-exec-rules-skyframe",
         "//src/main/java:clock",
         "//src/main/java:events",
@@ -791,6 +790,7 @@ java_test(
         "//src/main/java:shell",
         "//src/main/java:util",
         "//src/main/java:vfs",
+        "//src/main/java/com/google/devtools/build/lib/actions",
         "//src/main/java/com/google/devtools/build/lib/sandbox",
         "//third_party:guava",
         "//third_party:junit4",
diff --git a/src/test/shell/bazel/BUILD b/src/test/shell/bazel/BUILD
index d502705d17..604ec56e1f 100644
--- a/src/test/shell/bazel/BUILD
+++ b/src/test/shell/bazel/BUILD
@@ -112,6 +112,11 @@ genrule(
         "//src/java_tools/singlejar:srcs",
         "//src/main/protobuf:srcs",
         "//src/main/java: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",
+        "//src/main/java/com/google/devtools/build/lib/worker:srcs",
+        "//src/main/java/com/google/devtools/build/lib/standalone:srcs",
         "//src/tools/xcode-common:srcs",
         "//third_party:srcs",
     ],