diff options
author | 2016-01-07 21:26:41 +0000 | |
---|---|---|
committer | 2016-01-07 21:53:48 +0000 | |
commit | c4e6df18185665ad23be4e8d19b56560ab137381 (patch) | |
tree | 8d1f1c22eda10f530f63a2571981db97b70e140c /src | |
parent | ee6208bb8fdceb84b9c7f74b116fcd9b32d7d542 (diff) |
Rollback of commit e4133aab4db7cd640501d1113c259e8477006b6f.
*** Reason for rollback ***
Broke build of Bazel tests on ci.bazel.io
See http://ci.bazel.io/job/Bazel/JAVA_VERSION=1.8,PLATFORM_NAME=ubuntu_15.10-x86_64/280/console
Found using git bisect and /tmp/bazel-bin build --nobuild //src/tools/generate_workspace/src/main/java/com/google/devtools/build/workspace:workspace
*** Original change description ***
Factor implementation of bazel-specific cpp logic out of devtools/build/lib/BUILD into subpackage, to allow the objc implementation to extend that logic without a circular dependency. In particular, create a subpackage at lib/bazel/rules, and move relevant targets that were in lib/bazel down to the subpackage.
--
MOS_MIGRATED_REVID=111632586
Diffstat (limited to 'src')
6 files changed, 81 insertions, 170 deletions
diff --git a/src/main/java/com/google/devtools/build/docgen/BUILD b/src/main/java/com/google/devtools/build/docgen/BUILD index d65a47146e..68cfd2e24e 100644 --- a/src/main/java/com/google/devtools/build/docgen/BUILD +++ b/src/main/java/com/google/devtools/build/docgen/BUILD @@ -25,9 +25,9 @@ java_binary( main_class = "com.google.devtools.build.docgen.BuildEncyclopediaGenerator", deps = [ ":docgen_javalib", + "//src/main/java/com/google/devtools/build/lib:bazel-rules", "//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/bazel/rules:bazel-rules", ], ) diff --git a/src/main/java/com/google/devtools/build/lib/BUILD b/src/main/java/com/google/devtools/build/lib/BUILD index c5ec7b1e9c..e84a40baa3 100644 --- a/src/main/java/com/google/devtools/build/lib/BUILD +++ b/src/main/java/com/google/devtools/build/lib/BUILD @@ -460,16 +460,65 @@ java_library( ) java_library( + name = "bazel-rules", + srcs = glob( + [ + "bazel/rules/**/*.java", + ], + exclude = [ + "bazel/rules/workspace/*.java", + ], + ), + resources = glob( + [ + "bazel/rules/**/*.txt", + "bazel/rules/**/*.WORKSPACE", + ], + ), + deps = [ + ":android-rules", + ":bazel", + ":bazel-repository", + ":build-base", + ":build-info", + ":collect", + ":common", + ":events", + ":ideinfo", + ":java-rules", + ":packages-internal", + ":proto-rules", + ":python-rules", + ":skylarkinterface", + ":util", + ":vfs", + "//src/main/java/com/google/devtools/build/lib/actions", + "//src/main/java/com/google/devtools/build/lib/query2:query-output", + "//src/main/java/com/google/devtools/build/lib/rules/apple", + "//src/main/java/com/google/devtools/build/lib/rules/cpp", + "//src/main/java/com/google/devtools/build/lib/rules/genquery", + "//src/main/java/com/google/devtools/build/lib/rules/objc", + "//src/main/java/com/google/devtools/build/skyframe", + "//src/main/java/com/google/devtools/common/options", + "//src/main/protobuf:crosstool_config_proto", + "//third_party:guava", + "//third_party:joda_time", + "//third_party:jsr305", + ], +) + +java_library( name = "bazel-main", srcs = glob(["bazel/*.java"]), resources = [ - "//src/main/java/com/google/devtools/build/lib/bazel/rules:java/java_stub_template.txt", - "//src/main/java/com/google/devtools/build/lib/bazel/rules:python/stub_template.txt", + "bazel/rules/java/java_stub_template.txt", + "bazel/rules/python/stub_template.txt", ], deps = [ ":bazel", ":bazel-commands", ":bazel-repository", + ":bazel-rules", ":build-base", ":build-info", ":clock", @@ -481,8 +530,6 @@ java_library( ":vfs", "//src/main/java/com/google/devtools/build/lib/actions", "//src/main/java/com/google/devtools/build/lib/bazel/dash", - "//src/main/java/com/google/devtools/build/lib/bazel/rules:bazel-rules", - "//src/main/java/com/google/devtools/build/lib/bazel/rules:workspace", "//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", @@ -542,7 +589,6 @@ java_library( "//src/main/java/com/google/devtools/build/lib:build-base", "//src/main/java/com/google/devtools/build/lib:packages-internal", "//src/main/java/com/google/devtools/build/lib:vfs", - "//src/main/java/com/google/devtools/build/lib/bazel/rules:workspace", "//src/main/java/com/google/devtools/build/skyframe", "//third_party:aether", "//third_party:apache_commons_compress", diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/BUILD b/src/main/java/com/google/devtools/build/lib/bazel/rules/BUILD deleted file mode 100644 index fa9a9231f5..0000000000 --- a/src/main/java/com/google/devtools/build/lib/bazel/rules/BUILD +++ /dev/null @@ -1,104 +0,0 @@ -package( - default_visibility = ["//src:__subpackages__"], -) - -licenses(["notice"]) # Apache 2.0 - -exports_files( - [ - "java/java_stub_template.txt", - "python/stub_template.txt", - ], -) - -java_library( - name = "bazel-rules", - srcs = glob( - [ - "**/*.java", - ], - exclude = [ - "cpp/*.java", - "workspace/*.java", - ], - ), - resources = glob( - [ - "**/*.txt", - "**/*.WORKSPACE", - ], - ), - deps = [ - "//src/main/java/com/google/devtools/build/lib:android-rules", - "//src/main/java/com/google/devtools/build/lib:bazel", - "//src/main/java/com/google/devtools/build/lib:build-base", - "//src/main/java/com/google/devtools/build/lib:build-info", - "//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:ideinfo", - "//src/main/java/com/google/devtools/build/lib:java-rules", - "//src/main/java/com/google/devtools/build/lib:packages-internal", - "//src/main/java/com/google/devtools/build/lib:proto-rules", - "//src/main/java/com/google/devtools/build/lib:python-rules", - "//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/bazel/rules:workspace", - "//src/main/java/com/google/devtools/build/lib/bazel/rules/cpp:cpp-rules", - "//src/main/java/com/google/devtools/build/lib/query2:query-output", - "//src/main/java/com/google/devtools/build/lib/rules/apple", - "//src/main/java/com/google/devtools/build/lib/rules/cpp", - "//src/main/java/com/google/devtools/build/lib/rules/genquery", - "//src/main/java/com/google/devtools/build/lib/rules/objc", - "//src/main/java/com/google/devtools/build/skyframe", - "//src/main/java/com/google/devtools/common/options", - "//src/main/protobuf:crosstool_config_proto", - "//third_party:guava", - "//third_party:joda_time", - "//third_party:jsr305", - ], -) - -java_library( - name = "bazel-base-rules", - srcs = [ - "BazelBaseRuleClasses.java", - ], - deps = [ - "//src/main/java/com/google/devtools/build/lib:base-util", - "//src/main/java/com/google/devtools/build/lib:build-base", - "//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:packages-internal", - "//src/main/java/com/google/devtools/build/lib:syntax", - "//src/main/java/com/google/devtools/build/lib:util", - "//src/main/java/com/google/devtools/build/lib/actions", - "//src/main/java/com/google/devtools/build/lib/rules/apple", - "//src/main/java/com/google/devtools/build/lib/rules/cpp", - "//third_party:jsr305", - ], -) - -java_library( - name = "workspace", - srcs = glob( - [ - "workspace/*.java", - ], - ), - deps = [ - "//src/main/java/com/google/devtools/build/lib:base-util", - "//src/main/java/com/google/devtools/build/lib:build-base", - "//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:packages-internal", - "//src/main/java/com/google/devtools/build/lib:syntax", - "//src/main/java/com/google/devtools/build/lib:util", - "//src/main/java/com/google/devtools/build/lib/actions", - "//src/main/java/com/google/devtools/build/lib/rules/apple", - "//src/main/java/com/google/devtools/build/lib/rules/cpp", - "//src/main/protobuf:crosstool_config_proto", - "//third_party:jsr305", - ], -) diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/cpp/BUILD b/src/main/java/com/google/devtools/build/lib/bazel/rules/cpp/BUILD deleted file mode 100644 index 28778cd24e..0000000000 --- a/src/main/java/com/google/devtools/build/lib/bazel/rules/cpp/BUILD +++ /dev/null @@ -1,30 +0,0 @@ -package( - default_visibility = ["//src:__subpackages__"], -) - -licenses(["notice"]) # Apache 2.0 - -java_library( - name = "cpp-rules", - srcs = glob( - [ - "*.java", - ], - ), - deps = [ - "//src/main/java/com/google/devtools/build/lib:base-util", - "//src/main/java/com/google/devtools/build/lib:build-base", - "//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:packages-internal", - "//src/main/java/com/google/devtools/build/lib:syntax", - "//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/bazel/rules:bazel-base-rules", - "//src/main/java/com/google/devtools/build/lib/rules/apple", - "//src/main/java/com/google/devtools/build/lib/rules/cpp", - "//src/main/protobuf:crosstool_config_proto", - "//third_party:jsr305", - ], -) diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/BUILD b/src/main/java/com/google/devtools/build/lib/rules/objc/BUILD index 1db8eb3e98..c746977eff 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/objc/BUILD +++ b/src/main/java/com/google/devtools/build/lib/rules/objc/BUILD @@ -21,7 +21,6 @@ java_library( "//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/bazel/rules/cpp:cpp-rules", "//src/main/java/com/google/devtools/build/lib/rules/apple", "//src/main/java/com/google/devtools/build/lib/rules/cpp", "//src/main/java/com/google/devtools/common/options", diff --git a/src/test/java/com/google/devtools/build/lib/BUILD b/src/test/java/com/google/devtools/build/lib/BUILD index 17bed26241..46f09fe850 100644 --- a/src/test/java/com/google/devtools/build/lib/BUILD +++ b/src/test/java/com/google/devtools/build/lib/BUILD @@ -16,6 +16,7 @@ java_library( visibility = ["//visibility:public"], deps = [ "//src/main/java/com/google/devtools/build/lib:bazel-main", + "//src/main/java/com/google/devtools/build/lib:bazel-rules", "//src/main/java/com/google/devtools/build/lib:build-base", "//src/main/java/com/google/devtools/build/lib:clock", "//src/main/java/com/google/devtools/build/lib:collect", @@ -27,7 +28,6 @@ java_library( "//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/bazel/rules:bazel-rules", "//third_party:guava", "//third_party:guava-testlib", "//third_party:junit4", @@ -47,6 +47,7 @@ java_library( ":foundations_testutil", ":testutil", "//src/main/java/com/google/devtools/build/lib:bazel-main", + "//src/main/java/com/google/devtools/build/lib:bazel-rules", "//src/main/java/com/google/devtools/build/lib:build-base", "//src/main/java/com/google/devtools/build/lib:clock", "//src/main/java/com/google/devtools/build/lib:cmdline", @@ -58,7 +59,6 @@ java_library( "//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/bazel/rules:bazel-rules", "//src/main/java/com/google/devtools/build/skyframe", "//src/test/java/com/google/devtools/build/lib:packages_testutil", "//src/test/java/com/google/devtools/build/skyframe:testutil", @@ -86,6 +86,7 @@ java_test( ":skyframe_testutil", ":testutil", "//src/main/java/com/google/devtools/build/lib:bazel-main", + "//src/main/java/com/google/devtools/build/lib:bazel-rules", "//src/main/java/com/google/devtools/build/lib:build-base", "//src/main/java/com/google/devtools/build/lib:clock", "//src/main/java/com/google/devtools/build/lib:cmdline", @@ -98,7 +99,6 @@ java_test( "//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/bazel/rules:bazel-rules", "//src/main/java/com/google/devtools/build/skyframe", "//third_party:guava", "//third_party:guava-testlib", @@ -237,6 +237,7 @@ java_library( ":test_runner", ":testutil", "//src/main/java/com/google/devtools/build/lib:bazel-main", + "//src/main/java/com/google/devtools/build/lib:bazel-rules", "//src/main/java/com/google/devtools/build/lib:build-base", "//src/main/java/com/google/devtools/build/lib:clock", "//src/main/java/com/google/devtools/build/lib:concurrent", @@ -246,7 +247,6 @@ java_library( "//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/bazel/rules:bazel-rules", "//src/main/java/com/google/devtools/build/skyframe", "//src/main/java/com/google/devtools/common/options", "//third_party:guava", @@ -270,6 +270,7 @@ java_test( ":test_runner", ":testutil", "//src/main/java/com/google/devtools/build/lib:bazel-main", + "//src/main/java/com/google/devtools/build/lib:bazel-rules", "//src/main/java/com/google/devtools/build/lib:build-base", "//src/main/java/com/google/devtools/build/lib:clock", "//src/main/java/com/google/devtools/build/lib:collect", @@ -280,7 +281,6 @@ java_test( "//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/bazel/rules:bazel-rules", "//src/main/java/com/google/devtools/build/lib/rules/cpp", "//src/main/java/com/google/devtools/common/options", "//third_party:guava", @@ -314,6 +314,7 @@ java_library( ":testutil", "//src/main/java/com/google/devtools/build/lib:android-rules", "//src/main/java/com/google/devtools/build/lib:bazel-main", + "//src/main/java/com/google/devtools/build/lib:bazel-rules", "//src/main/java/com/google/devtools/build/lib:build-base", "//src/main/java/com/google/devtools/build/lib:clock", "//src/main/java/com/google/devtools/build/lib:collect", @@ -327,7 +328,6 @@ java_library( "//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/bazel/rules:bazel-rules", "//src/main/java/com/google/devtools/build/lib/query2", "//src/main/java/com/google/devtools/build/lib/query2:query-output", "//src/main/java/com/google/devtools/build/lib/rules/apple", @@ -361,11 +361,11 @@ java_test( ":test_runner", ":testutil", "//src/main/java/com/google/devtools/build/lib:bazel-main", + "//src/main/java/com/google/devtools/build/lib:bazel-rules", "//src/main/java/com/google/devtools/build/lib:build-base", "//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/java/com/google/devtools/build/lib/bazel/rules:bazel-rules", "//src/main/protobuf:extra_actions_base_proto", "//third_party:guava", "//third_party:guava-testlib", @@ -390,6 +390,7 @@ java_test( ":test_runner", ":testutil", "//src/main/java/com/google/devtools/build/lib:bazel-main", + "//src/main/java/com/google/devtools/build/lib:bazel-rules", "//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:java-rules", @@ -397,7 +398,6 @@ java_test( "//src/main/java/com/google/devtools/build/lib:python-rules", "//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/bazel/rules:bazel-rules", "//src/main/java/com/google/devtools/build/lib/rules/cpp", "//src/main/java/com/google/devtools/common/options", "//src/main/protobuf:extra_actions_base_proto", @@ -424,11 +424,11 @@ java_test( ":test_runner", ":testutil", "//src/main/java/com/google/devtools/build/lib:bazel-main", + "//src/main/java/com/google/devtools/build/lib:bazel-rules", "//src/main/java/com/google/devtools/build/lib:build-base", "//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/bazel/rules:bazel-rules", "//third_party:guava", "//third_party:junit4", "//third_party:truth", @@ -450,10 +450,10 @@ java_test( ":test_runner", ":testutil", "//src/main/java/com/google/devtools/build/lib:bazel-main", + "//src/main/java/com/google/devtools/build/lib:bazel-rules", "//src/main/java/com/google/devtools/build/lib:build-base", "//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/bazel/rules:bazel-rules", "//third_party:guava", "//third_party:junit4", "//third_party:truth", @@ -474,6 +474,7 @@ java_test( ":test_runner", ":testutil", "//src/main/java/com/google/devtools/build/lib:bazel-main", + "//src/main/java/com/google/devtools/build/lib:bazel-rules", "//src/main/java/com/google/devtools/build/lib:build-base", "//src/main/java/com/google/devtools/build/lib:collect", "//src/main/java/com/google/devtools/build/lib:events", @@ -482,7 +483,6 @@ java_test( "//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/bazel/rules:bazel-rules", "//src/main/java/com/google/devtools/build/lib/rules/cpp", "//src/main/java/com/google/devtools/build/skyframe", "//third_party:auto_value", @@ -526,6 +526,7 @@ java_library( ":testutil", "//src/main/java/com/google/devtools/build/docgen:docgen_javalib", "//src/main/java/com/google/devtools/build/lib:bazel-main", + "//src/main/java/com/google/devtools/build/lib:bazel-rules", "//src/main/java/com/google/devtools/build/lib:build-base", "//src/main/java/com/google/devtools/build/lib:clock", "//src/main/java/com/google/devtools/build/lib:events", @@ -535,7 +536,6 @@ java_library( "//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/bazel/rules:bazel-rules", "//src/main/java/com/google/devtools/build/skyframe", "//src/main/java/com/google/devtools/common/options", "//src/main/protobuf:build_proto", @@ -570,12 +570,12 @@ java_test( ":test_runner", ":testutil", "//src/main/java/com/google/devtools/build/lib:bazel-main", + "//src/main/java/com/google/devtools/build/lib:bazel-rules", "//src/main/java/com/google/devtools/build/lib:build-base", "//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/bazel/rules:bazel-rules", "//src/main/java/com/google/devtools/build/skyframe", "//src/main/protobuf:build_proto", "//third_party:guava", @@ -599,10 +599,10 @@ java_test( ":analysis_testutil", ":packages_testutil", ":test_runner", + "//src/main/java/com/google/devtools/build/lib:bazel-rules", "//src/main/java/com/google/devtools/build/lib:build-base", "//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/bazel/rules:bazel-rules", "//src/main/java/com/google/devtools/build/skyframe", "//src/test/java/com/google/devtools/build/lib:testutil", "//third_party:guava", @@ -625,6 +625,7 @@ java_test( ":test_runner", ":testutil", "//src/main/java/com/google/devtools/build/lib:bazel-main", + "//src/main/java/com/google/devtools/build/lib:bazel-rules", "//src/main/java/com/google/devtools/build/lib:build-base", "//src/main/java/com/google/devtools/build/lib:collect", "//src/main/java/com/google/devtools/build/lib:common", @@ -633,7 +634,6 @@ java_test( "//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/java/com/google/devtools/build/lib/bazel/rules:bazel-rules", "//src/main/protobuf:android_studio_ide_info_proto", "//third_party:guava", "//third_party:guava-testlib", @@ -708,9 +708,9 @@ java_binary( main_class = "com.google.devtools.build.lib.syntax.SkylarkShell", deps = [ "//src/main/java/com/google/devtools/build/lib:bazel-main", + "//src/main/java/com/google/devtools/build/lib:bazel-rules", "//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/bazel/rules:bazel-rules", ], ) @@ -726,6 +726,7 @@ java_test( ":test_runner", ":testutil", "//src/main/java/com/google/devtools/build/lib:bazel-main", + "//src/main/java/com/google/devtools/build/lib:bazel-rules", "//src/main/java/com/google/devtools/build/lib:build-base", "//src/main/java/com/google/devtools/build/lib:collect", "//src/main/java/com/google/devtools/build/lib:concurrent", @@ -735,7 +736,6 @@ java_test( "//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/bazel/rules:bazel-rules", "//third_party:guava", "//third_party:guava-testlib", "//third_party:jsr305", @@ -777,8 +777,8 @@ java_test( ":foundations_testutil", ":packages_testutil", "//src/main/java/com/google/devtools/build/lib:bazel-main", + "//src/main/java/com/google/devtools/build/lib:bazel-rules", "//src/main/java/com/google/devtools/build/lib:packages", - "//src/main/java/com/google/devtools/build/lib/bazel/rules:bazel-rules", "//third_party:guava", "//third_party:guava-testlib", "//third_party:jsr305", @@ -798,6 +798,7 @@ java_library( ":test_runner", ":testutil", "//src/main/java/com/google/devtools/build/lib:bazel-main", + "//src/main/java/com/google/devtools/build/lib:bazel-rules", "//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", @@ -805,7 +806,6 @@ java_library( "//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/bazel/rules:bazel-rules", "//third_party:guava", "//third_party:guava-testlib", "//third_party:jsr305", @@ -826,6 +826,7 @@ java_library( ":syntax_testutil", ":testutil", "//src/main/java/com/google/devtools/build/lib:bazel-main", + "//src/main/java/com/google/devtools/build/lib:bazel-rules", "//src/main/java/com/google/devtools/build/lib:build-base", "//src/main/java/com/google/devtools/build/lib:collect", "//src/main/java/com/google/devtools/build/lib:concurrent", @@ -833,7 +834,6 @@ java_library( "//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/java/com/google/devtools/build/lib/bazel/rules:bazel-rules", "//third_party:guava", "//third_party:guava-testlib", "//third_party:jsr305", @@ -856,6 +856,7 @@ java_test( ":test_runner", ":testutil", "//src/main/java/com/google/devtools/build/lib:bazel-main", + "//src/main/java/com/google/devtools/build/lib:bazel-rules", "//src/main/java/com/google/devtools/build/lib:build-base", "//src/main/java/com/google/devtools/build/lib:collect", "//src/main/java/com/google/devtools/build/lib:concurrent", @@ -867,7 +868,6 @@ java_test( "//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/bazel/rules:bazel-rules", "//src/main/java/com/google/devtools/build/skyframe", "//third_party:guava", "//third_party:guava-testlib", @@ -887,10 +887,10 @@ java_test( ":analysis_testutil", ":testutil", "//src/main/java/com/google/devtools/build/lib:bazel-main", + "//src/main/java/com/google/devtools/build/lib:bazel-rules", "//src/main/java/com/google/devtools/build/lib:build-base", "//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/bazel/rules:bazel-rules", "//third_party:guava", "//third_party:guava-testlib", "//third_party:jsr305", @@ -909,9 +909,9 @@ java_test( ":analysis_testutil", ":testutil", "//src/main/java/com/google/devtools/build/lib:bazel-main", + "//src/main/java/com/google/devtools/build/lib:bazel-rules", "//src/main/java/com/google/devtools/build/lib:java-rules", "//src/main/java/com/google/devtools/build/lib:vfs", - "//src/main/java/com/google/devtools/build/lib/bazel/rules:bazel-rules", "//third_party:guava", "//third_party:guava-testlib", "//third_party:jsr305", @@ -930,6 +930,7 @@ java_test( ":analysis_testutil", ":testutil", "//src/main/java/com/google/devtools/build/lib:bazel-main", + "//src/main/java/com/google/devtools/build/lib:bazel-rules", "//src/main/java/com/google/devtools/build/lib:build-base", "//src/main/java/com/google/devtools/build/lib:cmdline", "//src/main/java/com/google/devtools/build/lib:common", @@ -937,7 +938,6 @@ java_test( "//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/bazel/rules:bazel-rules", "//src/main/java/com/google/devtools/build/lib/rules/cpp", "//src/main/java/com/google/devtools/common/options", "//src/main/protobuf:crosstool_config_proto", @@ -991,10 +991,10 @@ java_test( ":foundations_testutil", ":test_runner", "//src/main/java/com/google/devtools/build/lib:bazel-main", + "//src/main/java/com/google/devtools/build/lib:bazel-rules", "//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", - "//src/main/java/com/google/devtools/build/lib/bazel/rules:bazel-rules", "//src/main/protobuf:crosstool_config_proto", "//third_party:guava", "//third_party:junit4", @@ -1035,6 +1035,7 @@ java_test( ":foundations_testutil", ":test_runner", ":testutil", + "//src/main/java/com/google/devtools/build/lib:bazel-rules", "//src/main/java/com/google/devtools/build/lib:build-base", "//src/main/java/com/google/devtools/build/lib:clock", "//src/main/java/com/google/devtools/build/lib:io", @@ -1042,7 +1043,6 @@ java_test( "//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/bazel/rules:bazel-rules", "//src/main/java/com/google/devtools/common/options", "//src/main/protobuf:invocation_policy_proto", "//src/main/protobuf:test_status_proto", @@ -1063,6 +1063,7 @@ java_test( ":analysis_testutil", ":foundations_testutil", ":testutil", + "//src/main/java/com/google/devtools/build/lib:bazel-rules", "//src/main/java/com/google/devtools/build/lib:build-base", "//src/main/java/com/google/devtools/build/lib:clock", "//src/main/java/com/google/devtools/build/lib:events", @@ -1071,7 +1072,6 @@ java_test( "//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/bazel/rules:bazel-rules", "//src/main/java/com/google/devtools/build/lib/sandbox", "//src/main/java/com/google/devtools/common/options", "//third_party:guava", @@ -1090,6 +1090,7 @@ java_test( ":analysis_testutil", ":foundations_testutil", ":testutil", + "//src/main/java/com/google/devtools/build/lib:bazel-rules", "//src/main/java/com/google/devtools/build/lib:build-base", "//src/main/java/com/google/devtools/build/lib:clock", "//src/main/java/com/google/devtools/build/lib:events", @@ -1098,7 +1099,6 @@ java_test( "//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/bazel/rules:bazel-rules", "//src/main/java/com/google/devtools/build/lib/rules/apple", "//src/main/java/com/google/devtools/build/lib/standalone", "//src/main/java/com/google/devtools/common/options", @@ -1119,12 +1119,12 @@ java_test( ":foundations_testutil", ":test_runner", ":testutil", + "//src/main/java/com/google/devtools/build/lib:bazel-rules", "//src/main/java/com/google/devtools/build/lib:build-base", "//src/main/java/com/google/devtools/build/lib:inmemoryfs", "//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/bazel/rules:bazel-rules", "//third_party:guava", "//third_party:junit4", "//third_party:protobuf", |