Skip to content

Commit

Permalink
Move Java rules out of the build/lib package
Browse files Browse the repository at this point in the history 
PiperOrigin-RevId: 220060172
  • Loading branch information
@cushon
cushon authored and Copybara-Service committed Nov 5, 2018
1 parent 1db9e66 commit c1d7672
Show file tree
Hide file tree
Showing 8 changed files with 217 additions and 209 deletions.
4 changes: 2 additions & 2 deletions src/main/java/com/google/devtools/build/docgen/BUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand Down
190 changes: 10 additions & 180 deletions src/main/java/com/google/devtools/build/lib/BUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -671,7 +672,6 @@ java_library(
],
),
deps = [
":RpcSupport",
":android-rules",
":bazel",
":bazel-repository",
Expand All @@ -680,8 +680,6 @@ java_library(
":core-rules",
":core-workspace-rules",
":events",
":java-compilation",
":java-rules",
":packages-internal",
":proto-rules",
":python-rules",
Expand All @@ -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",
Expand Down Expand Up @@ -827,15 +828,15 @@ java_library(
":build-base",
":events",
":exitcode-external",
":java-compilation",
":java-rules",
":keep-going-option",
":packages-internal",
":runtime",
":util",
"//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",
Expand Down Expand Up @@ -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(
Expand Down Expand Up @@ -1210,8 +1040,6 @@ java_library(
deps = [
":build-base",
":events",
":java-compilation",
":java-rules",
":nativedeps-rules",
":packages-internal",
":proto-rules",
Expand All @@ -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",
Expand Down Expand Up @@ -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",
],
)

Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/google/devtools/build/lib/rules/genrule/BUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,15 @@ 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",
"//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/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",
Expand Down
Loading

0 comments on commit c1d7672

Please sign in to comment.