diff --git a/src/main/java/com/google/devtools/build/docgen/BUILD b/src/main/java/com/google/devtools/build/docgen/BUILD index 358502780cec90..3f658d55ceb36b 100644 --- a/src/main/java/com/google/devtools/build/docgen/BUILD +++ b/src/main/java/com/google/devtools/build/docgen/BUILD @@ -13,8 +13,6 @@ java_library( "//src/main/java/com/google/devtools/build/lib:build-base", "//src/main/java/com/google/devtools/build/lib:classpath-util", "//src/main/java/com/google/devtools/build/lib:events", - "//src/main/java/com/google/devtools/build/lib:java-compilation", - "//src/main/java/com/google/devtools/build/lib:java-rules", "//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:skylarkinterface", @@ -23,6 +21,8 @@ java_library( "//src/main/java/com/google/devtools/build/lib/rules/apple", "//src/main/java/com/google/devtools/build/lib/rules/apple/swift", "//src/main/java/com/google/devtools/build/lib/rules/cpp", + "//src/main/java/com/google/devtools/build/lib/rules/java:java-compilation", + "//src/main/java/com/google/devtools/build/lib/rules/java:java-rules", "//src/main/java/com/google/devtools/build/lib/rules/objc", "//src/main/java/com/google/devtools/build/lib/rules/platform", "//src/main/java/com/google/devtools/build/lib/skylarkbuildapi", diff --git a/src/main/java/com/google/devtools/build/lib/BUILD b/src/main/java/com/google/devtools/build/lib/BUILD index 3f6c331bc54343..b076df77af711e 100644 --- a/src/main/java/com/google/devtools/build/lib/BUILD +++ b/src/main/java/com/google/devtools/build/lib/BUILD @@ -49,6 +49,7 @@ filegroup( "//src/main/java/com/google/devtools/build/lib/rules/config:srcs", "//src/main/java/com/google/devtools/build/lib/rules/cpp/proto:srcs", "//src/main/java/com/google/devtools/build/lib/rules/cpp:srcs", + "//src/main/java/com/google/devtools/build/lib/rules/java:srcs", "//src/main/java/com/google/devtools/build/lib/rules/genquery:srcs", "//src/main/java/com/google/devtools/build/lib/rules/genrule:srcs", "//src/main/java/com/google/devtools/build/lib/rules/objc:srcs", @@ -671,7 +672,6 @@ java_library( ], ), deps = [ - ":RpcSupport", ":android-rules", ":bazel", ":bazel-repository", @@ -680,8 +680,6 @@ java_library( ":core-rules", ":core-workspace-rules", ":events", - ":java-compilation", - ":java-rules", ":packages-internal", ":proto-rules", ":python-rules", @@ -704,6 +702,9 @@ java_library( "//src/main/java/com/google/devtools/build/lib/rules/cpp/proto:CcProtoLibrary", "//src/main/java/com/google/devtools/build/lib/rules/genquery", "//src/main/java/com/google/devtools/build/lib/rules/genrule", + "//src/main/java/com/google/devtools/build/lib/rules/java:RpcSupport", + "//src/main/java/com/google/devtools/build/lib/rules/java:java-compilation", + "//src/main/java/com/google/devtools/build/lib/rules/java:java-rules", "//src/main/java/com/google/devtools/build/lib/rules/objc", "//src/main/java/com/google/devtools/build/lib/rules/platform", "//src/main/java/com/google/devtools/build/lib/skyframe/serialization/autocodec", @@ -827,8 +828,6 @@ java_library( ":build-base", ":events", ":exitcode-external", - ":java-compilation", - ":java-rules", ":keep-going-option", ":packages-internal", ":runtime", @@ -836,6 +835,8 @@ java_library( "//src/main/java/com/google/devtools/build/lib/query2", "//src/main/java/com/google/devtools/build/lib/query2:abstract-blaze-query-env", "//src/main/java/com/google/devtools/build/lib/query2:query-engine", + "//src/main/java/com/google/devtools/build/lib/rules/java:java-compilation", + "//src/main/java/com/google/devtools/build/lib/rules/java:java-rules", "//src/main/java/com/google/devtools/build/lib/vfs", "//src/main/java/com/google/devtools/build/lib/vfs:pathfragment", "//src/main/java/com/google/devtools/build/skyframe", @@ -971,177 +972,6 @@ java_library( ], ) -java_library( - name = "java-rules", - srcs = [ - "rules/java/GenericBuildInfoPropertiesTranslator.java", - "rules/java/JavaBinary.java", - "rules/java/JavaCcLinkParamsProvider.java", - "rules/java/JavaConfigurationLoader.java", - "rules/java/JavaHostRuntimeAliasRule.java", - "rules/java/JavaImport.java", - "rules/java/JavaImportBaseRule.java", - "rules/java/JavaInfo.java", - "rules/java/JavaLibrary.java", - "rules/java/JavaPackageConfiguration.java", - "rules/java/JavaPackageConfigurationRule.java", - "rules/java/JavaPlugin.java", - "rules/java/JavaPrimaryClassProvider.java", - "rules/java/JavaRuntime.java", - "rules/java/JavaRuntimeAliasRule.java", - "rules/java/JavaRuntimeClasspathProvider.java", - "rules/java/JavaRuntimeRule.java", - "rules/java/JavaSkylarkCommon.java", - "rules/java/JavaSourceInfoProvider.java", - "rules/java/JavaToolchain.java", - "rules/java/JavaToolchainAliasRule.java", - "rules/java/JavaToolchainRule.java", - "rules/java/JavaToolchainSkylarkApiProvider.java", - "rules/java/ProguardHelper.java", - "rules/java/ProguardLibrary.java", - "rules/java/ProguardLibraryRule.java", - "rules/java/ProguardSpecProvider.java", - "rules/java/proto/JavaLiteProtoAspect.java", - "rules/java/proto/JavaLiteProtoLibrary.java", - "rules/java/proto/JavaProtoAspect.java", - "rules/java/proto/JavaProtoAspectCommon.java", - "rules/java/proto/JavaProtoLibrary.java", - "rules/java/proto/JavaProtoLibraryAspectProvider.java", - "rules/java/proto/JavaProtoSkylarkCommon.java", - "rules/java/proto/JplCcLinkParams.java", - "rules/java/proto/ProtoJavacOpts.java", - "rules/java/proto/StrictDepsUtils.java", - ], - deps = [ - ":RpcSupport", - ":build-base", - ":events", - ":java-compilation", - ":java-implicit-attributes", - ":packages-internal", - ":proto-rules", - ":provider-collection", - ":skylarkinterface", - ":util", - "//src/main/java/com/google/devtools/build/lib/actions", - "//src/main/java/com/google/devtools/build/lib/collect", - "//src/main/java/com/google/devtools/build/lib/collect/nestedset", - "//src/main/java/com/google/devtools/build/lib/concurrent", - "//src/main/java/com/google/devtools/build/lib/rules/cpp", - "//src/main/java/com/google/devtools/build/lib/shell", - "//src/main/java/com/google/devtools/build/lib/skyframe/serialization/autocodec", - "//src/main/java/com/google/devtools/build/lib/skylarkbuildapi", - "//src/main/java/com/google/devtools/build/lib/skylarkbuildapi/java", - "//src/main/java/com/google/devtools/build/lib/vfs", - "//src/main/java/com/google/devtools/common/options", - "//src/main/protobuf:extra_actions_base_java_proto", - "//third_party:auto_value", - "//third_party:guava", - "//third_party:jsr305", - "//third_party/protobuf:protobuf_java", - ], -) - -java_library( - name = "RpcSupport", - srcs = ["rules/java/proto/RpcSupport.java"], - deps = [ - ":build-base", - ":java-compilation", - ":packages-internal", - ":proto-rules", - "//src/main/java/com/google/devtools/build/lib/actions", - "//src/main/java/com/google/devtools/build/lib/collect", - "//src/main/java/com/google/devtools/build/lib/collect/nestedset", - "//third_party:guava", - ], -) - -java_library( - name = "java-compilation", - srcs = [ - "rules/java/BuildInfoPropertiesTranslator.java", - "rules/java/ClasspathConfiguredFragment.java", - "rules/java/DeployArchiveBuilder.java", - "rules/java/ImportDepsCheckActionBuilder.java", - "rules/java/JavaBuildInfoFactory.java", - "rules/java/JavaCommon.java", - "rules/java/JavaCompilationArgsProvider.java", - "rules/java/JavaCompilationArtifacts.java", - "rules/java/JavaCompilationHelper.java", - "rules/java/JavaCompilationInfoProvider.java", - "rules/java/JavaCompileActionBuilder.java", - "rules/java/JavaConfiguration.java", - "rules/java/JavaExportsProvider.java", - "rules/java/JavaGenJarsProvider.java", - "rules/java/JavaHeaderCompileActionBuilder.java", - "rules/java/JavaHelper.java", - "rules/java/JavaInfo.java", - "rules/java/JavaInfoBuildHelper.java", - "rules/java/JavaLibraryHelper.java", - "rules/java/JavaNativeLibraryProvider.java", - "rules/java/JavaOptions.java", - "rules/java/JavaPackageConfigurationProvider.java", - "rules/java/JavaPluginInfoProvider.java", - "rules/java/JavaRuleClasses.java", - "rules/java/JavaRuleOutputJarsProvider.java", - "rules/java/JavaRunfilesProvider.java", - "rules/java/JavaRuntimeInfo.java", - "rules/java/JavaRuntimeToolchainInfo.java", - "rules/java/JavaSemantics.java", - "rules/java/JavaSkylarkApiProvider.java", - "rules/java/JavaSkylarkCommon.java", - "rules/java/JavaSourceInfoProvider.java", - "rules/java/JavaSourceJarsProvider.java", - "rules/java/JavaStrictCompilationArgsProvider.java", - "rules/java/JavaTargetAttributes.java", - "rules/java/JavaToolchainProvider.java", - "rules/java/JavaUtil.java", - "rules/java/MessageBundleInfo.java", - "rules/java/NativeLibraryNestedSetBuilder.java", - "rules/java/OneVersionCheckActionBuilder.java", - "rules/java/ResourceJarActionBuilder.java", - "rules/java/SingleJarActionBuilder.java", - "rules/java/WriteBuildInfoPropertiesAction.java", - "rules/java/proto/GeneratedExtensionRegistryProvider.java", - ], - deps = [ - ":build-base", - ":build-info", - ":events", - ":java-implicit-attributes", - ":packages-internal", - ":provider-collection", - ":skylarkinterface", - ":util", - "//src/main/java/com/google/devtools/build/lib/actions", - "//src/main/java/com/google/devtools/build/lib/actions:commandline_item", - "//src/main/java/com/google/devtools/build/lib/actions:localhost_capacity", - "//src/main/java/com/google/devtools/build/lib/analysis/platform", - "//src/main/java/com/google/devtools/build/lib/analysis/skylark/annotations", - "//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/collect/nestedset", - "//src/main/java/com/google/devtools/build/lib/concurrent", - "//src/main/java/com/google/devtools/build/lib/rules/cpp", - "//src/main/java/com/google/devtools/build/lib/shell", - "//src/main/java/com/google/devtools/build/lib/skyframe/serialization/autocodec", - "//src/main/java/com/google/devtools/build/lib/skylarkbuildapi", - "//src/main/java/com/google/devtools/build/lib/skylarkbuildapi/java", - "//src/main/java/com/google/devtools/build/lib/vfs", - "//src/main/java/com/google/devtools/common/options", - "//src/main/protobuf:extra_actions_base_java_proto", - "//third_party:auto_value", - "//third_party:guava", - "//third_party:jsr305", - ], -) - -java_library( - name = "java-implicit-attributes", - srcs = ["rules/java/JavaImplicitAttributes.java"], -) - java_library( name = "core-rules", srcs = glob( @@ -1210,8 +1040,6 @@ java_library( deps = [ ":build-base", ":events", - ":java-compilation", - ":java-rules", ":nativedeps-rules", ":packages-internal", ":proto-rules", @@ -1227,6 +1055,8 @@ java_library( "//src/main/java/com/google/devtools/build/lib/concurrent", "//src/main/java/com/google/devtools/build/lib/rules/config", "//src/main/java/com/google/devtools/build/lib/rules/cpp", + "//src/main/java/com/google/devtools/build/lib/rules/java:java-compilation", + "//src/main/java/com/google/devtools/build/lib/rules/java:java-rules", "//src/main/java/com/google/devtools/build/lib/skyframe/serialization/autocodec", "//src/main/java/com/google/devtools/build/lib/skylarkbuildapi", "//src/main/java/com/google/devtools/build/lib/skylarkbuildapi/android", @@ -1272,11 +1102,11 @@ java_library( name = "shared-base-rules", exports = [ ":android-rules", - ":java-compilation", - ":java-rules", ":nativedeps-rules", ":proto-rules", ":python-rules", + "//src/main/java/com/google/devtools/build/lib/rules/java:java-compilation", + "//src/main/java/com/google/devtools/build/lib/rules/java:java-rules", ], ) diff --git a/src/main/java/com/google/devtools/build/lib/rules/genrule/BUILD b/src/main/java/com/google/devtools/build/lib/rules/genrule/BUILD index b067369d1a7134..14ef74ee9279f2 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/genrule/BUILD +++ b/src/main/java/com/google/devtools/build/lib/rules/genrule/BUILD @@ -14,8 +14,6 @@ java_library( deps = [ "//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:java-compilation", - "//src/main/java/com/google/devtools/build/lib:java-implicit-attributes", "//src/main/java/com/google/devtools/build/lib:packages", "//src/main/java/com/google/devtools/build/lib/actions", "//src/main/java/com/google/devtools/build/lib/actions:localhost_capacity", @@ -23,6 +21,8 @@ java_library( "//src/main/java/com/google/devtools/build/lib/collect/nestedset", "//src/main/java/com/google/devtools/build/lib/concurrent", "//src/main/java/com/google/devtools/build/lib/rules/cpp", + "//src/main/java/com/google/devtools/build/lib/rules/java:java-compilation", + "//src/main/java/com/google/devtools/build/lib/rules/java:java-implicit-attributes", "//src/main/java/com/google/devtools/build/lib/skyframe/serialization/autocodec", "//src/main/java/com/google/devtools/build/lib/vfs", "//third_party:guava", diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/BUILD b/src/main/java/com/google/devtools/build/lib/rules/java/BUILD new file mode 100644 index 00000000000000..6576fa71b56c56 --- /dev/null +++ b/src/main/java/com/google/devtools/build/lib/rules/java/BUILD @@ -0,0 +1,178 @@ +package(default_visibility = ["//src:__subpackages__"]) + +filegroup( + name = "srcs", + srcs = glob(["**"]), + visibility = ["//src/main/java/com/google/devtools/build/lib:__pkg__"], +) + +java_library( + name = "java-rules", + srcs = [ + "GenericBuildInfoPropertiesTranslator.java", + "JavaBinary.java", + "JavaCcLinkParamsProvider.java", + "JavaConfigurationLoader.java", + "JavaHostRuntimeAliasRule.java", + "JavaImport.java", + "JavaImportBaseRule.java", + "JavaInfo.java", + "JavaLibrary.java", + "JavaPackageConfiguration.java", + "JavaPackageConfigurationRule.java", + "JavaPlugin.java", + "JavaPrimaryClassProvider.java", + "JavaRuntime.java", + "JavaRuntimeAliasRule.java", + "JavaRuntimeClasspathProvider.java", + "JavaRuntimeRule.java", + "JavaSkylarkCommon.java", + "JavaSourceInfoProvider.java", + "JavaToolchain.java", + "JavaToolchainAliasRule.java", + "JavaToolchainRule.java", + "JavaToolchainSkylarkApiProvider.java", + "ProguardHelper.java", + "ProguardLibrary.java", + "ProguardLibraryRule.java", + "ProguardSpecProvider.java", + "proto/JavaLiteProtoAspect.java", + "proto/JavaLiteProtoLibrary.java", + "proto/JavaProtoAspect.java", + "proto/JavaProtoAspectCommon.java", + "proto/JavaProtoLibrary.java", + "proto/JavaProtoLibraryAspectProvider.java", + "proto/JavaProtoSkylarkCommon.java", + "proto/JplCcLinkParams.java", + "proto/ProtoJavacOpts.java", + "proto/StrictDepsUtils.java", + ], + deps = [ + ":java-compilation", + ":java-implicit-attributes", + "//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-internal", + "//src/main/java/com/google/devtools/build/lib:proto-rules", + "//src/main/java/com/google/devtools/build/lib:provider-collection", + "//src/main/java/com/google/devtools/build/lib:skylarkinterface", + "//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/collect", + "//src/main/java/com/google/devtools/build/lib/collect/nestedset", + "//src/main/java/com/google/devtools/build/lib/concurrent", + "//src/main/java/com/google/devtools/build/lib/rules/cpp", + "//src/main/java/com/google/devtools/build/lib/rules/java:RpcSupport", + "//src/main/java/com/google/devtools/build/lib/shell", + "//src/main/java/com/google/devtools/build/lib/skyframe/serialization/autocodec", + "//src/main/java/com/google/devtools/build/lib/skylarkbuildapi", + "//src/main/java/com/google/devtools/build/lib/skylarkbuildapi/java", + "//src/main/java/com/google/devtools/build/lib/vfs", + "//src/main/java/com/google/devtools/common/options", + "//src/main/protobuf:extra_actions_base_java_proto", + "//third_party:auto_value", + "//third_party:guava", + "//third_party:jsr305", + "//third_party/protobuf:protobuf_java", + ], +) + +java_library( + name = "java-compilation", + srcs = [ + "BuildInfoPropertiesTranslator.java", + "ClasspathConfiguredFragment.java", + "DeployArchiveBuilder.java", + "ImportDepsCheckActionBuilder.java", + "JavaBuildInfoFactory.java", + "JavaCommon.java", + "JavaCompilationArgsProvider.java", + "JavaCompilationArtifacts.java", + "JavaCompilationHelper.java", + "JavaCompilationInfoProvider.java", + "JavaCompileActionBuilder.java", + "JavaConfiguration.java", + "JavaExportsProvider.java", + "JavaGenJarsProvider.java", + "JavaHeaderCompileActionBuilder.java", + "JavaHelper.java", + "JavaInfo.java", + "JavaInfoBuildHelper.java", + "JavaLibraryHelper.java", + "JavaNativeLibraryProvider.java", + "JavaOptions.java", + "JavaPackageConfigurationProvider.java", + "JavaPluginInfoProvider.java", + "JavaRuleClasses.java", + "JavaRuleOutputJarsProvider.java", + "JavaRunfilesProvider.java", + "JavaRuntimeInfo.java", + "JavaRuntimeToolchainInfo.java", + "JavaSemantics.java", + "JavaSkylarkApiProvider.java", + "JavaSkylarkCommon.java", + "JavaSourceInfoProvider.java", + "JavaSourceJarsProvider.java", + "JavaStrictCompilationArgsProvider.java", + "JavaTargetAttributes.java", + "JavaToolchainProvider.java", + "JavaUtil.java", + "MessageBundleInfo.java", + "NativeLibraryNestedSetBuilder.java", + "OneVersionCheckActionBuilder.java", + "ResourceJarActionBuilder.java", + "SingleJarActionBuilder.java", + "WriteBuildInfoPropertiesAction.java", + "proto/GeneratedExtensionRegistryProvider.java", + ], + deps = [ + ":java-implicit-attributes", + "//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:events", + "//src/main/java/com/google/devtools/build/lib:packages-internal", + "//src/main/java/com/google/devtools/build/lib:provider-collection", + "//src/main/java/com/google/devtools/build/lib:skylarkinterface", + "//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/actions:commandline_item", + "//src/main/java/com/google/devtools/build/lib/actions:localhost_capacity", + "//src/main/java/com/google/devtools/build/lib/analysis/platform", + "//src/main/java/com/google/devtools/build/lib/analysis/skylark/annotations", + "//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/collect/nestedset", + "//src/main/java/com/google/devtools/build/lib/concurrent", + "//src/main/java/com/google/devtools/build/lib/rules/cpp", + "//src/main/java/com/google/devtools/build/lib/shell", + "//src/main/java/com/google/devtools/build/lib/skyframe/serialization/autocodec", + "//src/main/java/com/google/devtools/build/lib/skylarkbuildapi", + "//src/main/java/com/google/devtools/build/lib/skylarkbuildapi/java", + "//src/main/java/com/google/devtools/build/lib/vfs", + "//src/main/java/com/google/devtools/common/options", + "//src/main/protobuf:extra_actions_base_java_proto", + "//third_party:auto_value", + "//third_party:guava", + "//third_party:jsr305", + ], +) + +java_library( + name = "java-implicit-attributes", + srcs = ["JavaImplicitAttributes.java"], +) + +java_library( + name = "RpcSupport", + srcs = ["proto/RpcSupport.java"], + deps = [ + ":java-compilation", + "//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:proto-rules", + "//src/main/java/com/google/devtools/build/lib/actions", + "//src/main/java/com/google/devtools/build/lib/collect", + "//src/main/java/com/google/devtools/build/lib/collect/nestedset", + "//third_party:guava", + ], +) 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 5a2c8ca33dc128..df136eef63115b 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 @@ -15,8 +15,6 @@ java_library( "//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:events", - "//src/main/java/com/google/devtools/build/lib:java-compilation", - "//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:skylarkinterface", @@ -31,6 +29,8 @@ java_library( "//src/main/java/com/google/devtools/build/lib/rules/apple", "//src/main/java/com/google/devtools/build/lib/rules/config", "//src/main/java/com/google/devtools/build/lib/rules/cpp", + "//src/main/java/com/google/devtools/build/lib/rules/java:java-compilation", + "//src/main/java/com/google/devtools/build/lib/rules/java:java-rules", "//src/main/java/com/google/devtools/build/lib/shell", "//src/main/java/com/google/devtools/build/lib/skyframe/serialization/autocodec", "//src/main/java/com/google/devtools/build/lib/skylarkbuildapi", diff --git a/src/test/java/com/google/devtools/build/lib/BUILD b/src/test/java/com/google/devtools/build/lib/BUILD index 5684ce44442a42..34b8a1b53e7e37 100644 --- a/src/test/java/com/google/devtools/build/lib/BUILD +++ b/src/test/java/com/google/devtools/build/lib/BUILD @@ -550,8 +550,6 @@ java_test( "//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:java-compilation", - "//src/main/java/com/google/devtools/build/lib:java-rules", "//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/actions", @@ -562,6 +560,8 @@ java_test( "//src/main/java/com/google/devtools/build/lib/collect/nestedset", "//src/main/java/com/google/devtools/build/lib/concurrent", "//src/main/java/com/google/devtools/build/lib/rules/cpp", + "//src/main/java/com/google/devtools/build/lib/rules/java:java-compilation", + "//src/main/java/com/google/devtools/build/lib/rules/java:java-rules", "//src/main/java/com/google/devtools/build/lib/skyframe/serialization/autocodec", "//src/main/java/com/google/devtools/build/lib/skyframe/serialization/testutils", "//src/main/java/com/google/devtools/build/lib/vfs", @@ -608,8 +608,6 @@ java_library( "//src/main/java/com/google/devtools/build/lib:core-rules", "//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:java-compilation", - "//src/main/java/com/google/devtools/build/lib:java-rules", "//src/main/java/com/google/devtools/build/lib:keep-going-option", "//src/main/java/com/google/devtools/build/lib:loading-phase-threads-option", "//src/main/java/com/google/devtools/build/lib:packages", @@ -632,6 +630,8 @@ java_library( "//src/main/java/com/google/devtools/build/lib/rules/config", "//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/java:java-compilation", + "//src/main/java/com/google/devtools/build/lib/rules/java:java-rules", "//src/main/java/com/google/devtools/build/lib/rules/objc", "//src/main/java/com/google/devtools/build/lib/rules/platform", "//src/main/java/com/google/devtools/build/lib/skyframe/packages", @@ -720,13 +720,13 @@ java_test( "//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:java-compilation", - "//src/main/java/com/google/devtools/build/lib:java-rules", "//src/main/java/com/google/devtools/build/lib:packages", "//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/rules/cpp", + "//src/main/java/com/google/devtools/build/lib/rules/java:java-compilation", + "//src/main/java/com/google/devtools/build/lib/rules/java:java-rules", "//src/main/java/com/google/devtools/build/lib/rules/objc", "//src/main/java/com/google/devtools/build/lib/skyframe/serialization", "//src/main/java/com/google/devtools/build/lib/skyframe/serialization/testutils", @@ -808,8 +808,6 @@ java_test( "//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:java-compilation", - "//src/main/java/com/google/devtools/build/lib:java-rules", "//src/main/java/com/google/devtools/build/lib:packages", "//src/main/java/com/google/devtools/build/lib:skylarkinterface", "//src/main/java/com/google/devtools/build/lib:util", @@ -820,6 +818,8 @@ java_test( "//src/main/java/com/google/devtools/build/lib/collect", "//src/main/java/com/google/devtools/build/lib/collect/nestedset", "//src/main/java/com/google/devtools/build/lib/rules/cpp", + "//src/main/java/com/google/devtools/build/lib/rules/java:java-compilation", + "//src/main/java/com/google/devtools/build/lib/rules/java:java-rules", "//src/main/java/com/google/devtools/build/lib/skyframe/serialization/autocodec", "//src/main/java/com/google/devtools/build/lib/skyframe/serialization/testutils", "//src/main/java/com/google/devtools/build/lib/skyframe/serialization/testutils:depsutils", @@ -1109,9 +1109,9 @@ java_test( "//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:java-compilation", - "//src/main/java/com/google/devtools/build/lib:java-rules", "//src/main/java/com/google/devtools/build/lib:util", + "//src/main/java/com/google/devtools/build/lib/rules/java:java-compilation", + "//src/main/java/com/google/devtools/build/lib/rules/java:java-rules", "//src/main/java/com/google/devtools/build/lib/vfs", "//third_party:jsr305", ], @@ -1148,13 +1148,13 @@ java_test( "//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:filetype", - "//src/main/java/com/google/devtools/build/lib:java-compilation", - "//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/actions", "//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/collect/nestedset", + "//src/main/java/com/google/devtools/build/lib/rules/java:java-compilation", + "//src/main/java/com/google/devtools/build/lib/rules/java:java-rules", "//src/main/java/com/google/devtools/build/lib/vfs", "//third_party:jsr305", ], @@ -1167,7 +1167,7 @@ java_test( ":analysis_testutil", ":guava_junit_truth", "//src/main/java/com/google/devtools/build/lib:build-base", - "//src/main/java/com/google/devtools/build/lib:java-rules", + "//src/main/java/com/google/devtools/build/lib/rules/java:java-rules", ], ) @@ -1209,7 +1209,6 @@ java_test( "//src/main/java/com/google/devtools/build/lib:core-rules", "//src/main/java/com/google/devtools/build/lib:core-workspace-rules", "//src/main/java/com/google/devtools/build/lib:events", - "//src/main/java/com/google/devtools/build/lib:java-compilation", "//src/main/java/com/google/devtools/build/lib:packages-internal", "//src/main/java/com/google/devtools/build/lib:python-rules", "//src/main/java/com/google/devtools/build/lib:syntax", @@ -1219,6 +1218,7 @@ java_test( "//src/main/java/com/google/devtools/build/lib/collect/nestedset", "//src/main/java/com/google/devtools/build/lib/rules/config", "//src/main/java/com/google/devtools/build/lib/rules/cpp", + "//src/main/java/com/google/devtools/build/lib/rules/java:java-compilation", "//src/main/java/com/google/devtools/build/lib/vfs", "//src/main/java/com/google/devtools/common/options", "//src/main/protobuf:crosstool_config_java_proto", diff --git a/src/test/java/com/google/devtools/build/lib/rules/android/BUILD b/src/test/java/com/google/devtools/build/lib/rules/android/BUILD index 240841009eaab5..97961aa5bebbc1 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/android/BUILD +++ b/src/test/java/com/google/devtools/build/lib/rules/android/BUILD @@ -16,10 +16,10 @@ java_test( deps = [ "//src/main/java/com/google/devtools/build/lib:android-rules", "//src/main/java/com/google/devtools/build/lib:build-base", - "//src/main/java/com/google/devtools/build/lib:java-compilation", "//src/main/java/com/google/devtools/build/lib/actions", "//src/main/java/com/google/devtools/build/lib/cmdline", "//src/main/java/com/google/devtools/build/lib/collect/nestedset", + "//src/main/java/com/google/devtools/build/lib/rules/java:java-compilation", "//src/test/java/com/google/devtools/build/lib:actions_testutil", "//src/test/java/com/google/devtools/build/lib:analysis_testutil", "//third_party:guava", @@ -63,7 +63,6 @@ java_test( ":AndroidBuildViewTestCase", "//src/main/java/com/google/devtools/build/lib:android-rules", "//src/main/java/com/google/devtools/build/lib:build-base", - "//src/main/java/com/google/devtools/build/lib:java-compilation", "//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", @@ -72,6 +71,7 @@ java_test( "//src/main/java/com/google/devtools/build/lib/collect", "//src/main/java/com/google/devtools/build/lib/collect/nestedset", "//src/main/java/com/google/devtools/build/lib/rules/cpp", + "//src/main/java/com/google/devtools/build/lib/rules/java:java-compilation", "//src/main/java/com/google/devtools/build/lib/vfs", "//src/main/protobuf:android_deploy_info_java_proto", "//src/test/java/com/google/devtools/build/lib:actions_testutil", @@ -218,11 +218,11 @@ java_test( "//src/main/java/com/google/devtools/build/lib:android-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:java-compilation", "//src/main/java/com/google/devtools/build/lib/actions", "//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/collect/nestedset", + "//src/main/java/com/google/devtools/build/lib/rules/java:java-compilation", "//src/main/java/com/google/devtools/build/lib/vfs", "//src/test/java/com/google/devtools/build/lib:actions_testutil", "//src/test/java/com/google/devtools/build/lib:analysis_testutil", @@ -240,9 +240,9 @@ java_library( deps = [ "//src/main/java/com/google/devtools/build/lib:android-rules", "//src/main/java/com/google/devtools/build/lib:build-base", - "//src/main/java/com/google/devtools/build/lib:java-compilation", "//src/main/java/com/google/devtools/build/lib/actions", "//src/main/java/com/google/devtools/build/lib/cmdline", + "//src/main/java/com/google/devtools/build/lib/rules/java:java-compilation", "//src/main/protobuf:android_deploy_info_java_proto", "//src/test/java/com/google/devtools/build/lib:actions_testutil", "//src/test/java/com/google/devtools/build/lib:analysis_testutil", @@ -297,9 +297,9 @@ java_test( ":AndroidBuildViewTestCase", "//src/main/java/com/google/devtools/build/lib:android-rules", "//src/main/java/com/google/devtools/build/lib:build-base", - "//src/main/java/com/google/devtools/build/lib:java-compilation", "//src/main/java/com/google/devtools/build/lib/actions", "//src/main/java/com/google/devtools/build/lib/cmdline", + "//src/main/java/com/google/devtools/build/lib/rules/java:java-compilation", "//src/main/protobuf:extra_actions_base_java_proto", "//src/test/java/com/google/devtools/build/lib:actions_testutil", "//src/test/java/com/google/devtools/build/lib:java_compile_action_test_helper", @@ -327,9 +327,9 @@ java_library( srcs = ["AbstractAndroidLocalTestTestBase.java"], deps = [ "//src/main/java/com/google/devtools/build/lib:build-base", - "//src/main/java/com/google/devtools/build/lib:java-compilation", "//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/java:java-compilation", "//src/test/java/com/google/devtools/build/lib:actions_testutil", "//src/test/java/com/google/devtools/build/lib:analysis_testutil", "//third_party:guava", @@ -345,9 +345,9 @@ java_library( ":AbstractAndroidLocalTestTestBase", "//src/main/java/com/google/devtools/build/lib:android-rules", "//src/main/java/com/google/devtools/build/lib:build-base", - "//src/main/java/com/google/devtools/build/lib:java-rules", "//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/java:java-rules", "//src/test/java/com/google/devtools/build/lib:actions_testutil", "//src/test/java/com/google/devtools/build/lib:testutil", "//third_party:guava", diff --git a/src/test/java/com/google/devtools/build/lib/skylark/BUILD b/src/test/java/com/google/devtools/build/lib/skylark/BUILD index f4c4d214720496..7b463e462707bd 100644 --- a/src/test/java/com/google/devtools/build/lib/skylark/BUILD +++ b/src/test/java/com/google/devtools/build/lib/skylark/BUILD @@ -54,8 +54,6 @@ java_test( "//src/main/java/com/google/devtools/build/lib:build-base", "//src/main/java/com/google/devtools/build/lib:classpath-util", "//src/main/java/com/google/devtools/build/lib:events", - "//src/main/java/com/google/devtools/build/lib:java-compilation", - "//src/main/java/com/google/devtools/build/lib:java-rules", "//src/main/java/com/google/devtools/build/lib:packages", "//src/main/java/com/google/devtools/build/lib:python-rules", "//src/main/java/com/google/devtools/build/lib:skylarkinterface", @@ -65,6 +63,8 @@ java_test( "//src/main/java/com/google/devtools/build/lib/collect/nestedset", "//src/main/java/com/google/devtools/build/lib/concurrent", "//src/main/java/com/google/devtools/build/lib/rules/cpp", + "//src/main/java/com/google/devtools/build/lib/rules/java:java-compilation", + "//src/main/java/com/google/devtools/build/lib/rules/java:java-rules", "//src/main/java/com/google/devtools/build/lib/rules/objc", "//src/main/java/com/google/devtools/build/lib/vfs", "//src/main/java/com/google/devtools/build/skyframe",