--

MOS_MIGRATED_REVID=128663072

3 files changed, 102 insertions, 7 deletions

diff --git a/src/main/java/com/google/devtools/build/docgen/BUILD b/src/main/java/com/google/devtools/build/docgen/BUILD
index 3a48dc4f13..f52df1aad7 100644
--- a/src/main/java/com/google/devtools/build/docgen/BUILD
+++ b/src/main/java/com/google/devtools/build/docgen/BUILD
@@ -11,6 +11,7 @@ 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:java-rules",
         "//src/main/java/com/google/devtools/build/lib:packages",
         "//src/main/java/com/google/devtools/build/lib:skylarkinterface",
diff --git a/src/main/java/com/google/devtools/build/lib/BUILD b/src/main/java/com/google/devtools/build/lib/BUILD
index a7d30b7330..5354a34a28 100644
--- a/src/main/java/com/google/devtools/build/lib/BUILD
+++ b/src/main/java/com/google/devtools/build/lib/BUILD
@@ -532,6 +532,7 @@ java_library(
         ":concurrent",
         ":events",
         ":ideinfo",
+        ":java-compilation",
         ":java-rules",
         ":packages-internal",
         ":proto-rules",
@@ -596,6 +597,7 @@ java_library(
     deps = [
         ":events",
         ":exitcode-external",
+        ":java-compilation",
         ":java-rules",
         ":packages-internal",
         ":runtime",
@@ -709,18 +711,42 @@ java_library(
 
 java_library(
     name = "java-rules",
-    srcs = glob(
-        ["rules/java/**/*.java"],
-        exclude = [
-            "rules/java/JavaImplicitAttributes.java",
-            "rules/java/JavaToolchainDataParser.java",
-        ],
-    ),
+    srcs = [
+        "rules/java/GenericBuildInfoPropertiesTranslator.java",
+        "rules/java/JavaBinary.java",
+        "rules/java/JavaCcLinkParamsProvider.java",
+        "rules/java/JavaConfigurationLoader.java",
+        "rules/java/JavaCpuSupplier.java",
+        "rules/java/JavaImport.java",
+        "rules/java/JavaImportBaseRule.java",
+        "rules/java/JavaLibrary.java",
+        "rules/java/JavaPlugin.java",
+        "rules/java/JavaPrimaryClassProvider.java",
+        "rules/java/JavaRuntimeClasspathProvider.java",
+        "rules/java/JavaRuntimeJarProvider.java",
+        "rules/java/JavaSourceInfoProvider.java",
+        "rules/java/JavaToolchain.java",
+        "rules/java/JavaToolchainRule.java",
+        "rules/java/JavaToolchainSkylarkApiProvider.java",
+        "rules/java/JvmConfigurationLoader.java",
+        "rules/java/ProguardHelper.java",
+        "rules/java/ProguardLibrary.java",
+        "rules/java/ProguardLibraryRule.java",
+        "rules/java/ProguardSpecProvider.java",
+        "rules/java/proto/JavaCompilationArgsAspectProvider.java",
+        "rules/java/proto/JavaProtoAspect.java",
+        "rules/java/proto/JavaProtoLibrary.java",
+        "rules/java/proto/JavaProtoLibraryTransitiveFilesToBuildProvider.java",
+        "rules/java/proto/JavaRuntimeJarAspectProvider.java",
+        "rules/java/proto/JavaSourceJarsAspectProvider.java",
+        "rules/java/proto/StrictDepsUtils.java",
+    ],
     deps = [
         ":build-base",
         ":collect",
         ":concurrent",
         ":events",
+        ":java-compilation",
         ":java-implicit-attributes",
         ":packages-internal",
         ":proto-rules",
@@ -740,6 +766,70 @@ java_library(
 )
 
 java_library(
+    name = "java-compilation",
+    srcs = [
+        "rules/java/BaseJavaCompilationHelper.java",
+        "rules/java/BuildInfoPropertiesTranslator.java",
+        "rules/java/ClasspathConfiguredFragment.java",
+        "rules/java/DeployArchiveBuilder.java",
+        "rules/java/JavaBuildInfoFactory.java",
+        "rules/java/JavaCommon.java",
+        "rules/java/JavaCompilationArgs.java",
+        "rules/java/JavaCompilationArgsProvider.java",
+        "rules/java/JavaCompilationArtifacts.java",
+        "rules/java/JavaCompilationHelper.java",
+        "rules/java/JavaCompilationInfoProvider.java",
+        "rules/java/JavaCompileAction.java",
+        "rules/java/JavaConfiguration.java",
+        "rules/java/JavaConstraintProvider.java",
+        "rules/java/JavaExportsProvider.java",
+        "rules/java/JavaGenJarsProvider.java",
+        "rules/java/JavaHeaderCompileActionBuilder.java",
+        "rules/java/JavaHelper.java",
+        "rules/java/JavaLibraryHelper.java",
+        "rules/java/JavaNativeLibraryProvider.java",
+        "rules/java/JavaNeverlinkInfoProvider.java",
+        "rules/java/JavaOptions.java",
+        "rules/java/JavaPluginInfoProvider.java",
+        "rules/java/JavaRuleOutputJarsProvider.java",
+        "rules/java/JavaRunfilesProvider.java",
+        "rules/java/JavaSemantics.java",
+        "rules/java/JavaSkylarkApiProvider.java",
+        "rules/java/JavaSourceJarsProvider.java",
+        "rules/java/JavaTargetAttributes.java",
+        "rules/java/JavaToolchainData.java",
+        "rules/java/JavaToolchainProvider.java",
+        "rules/java/JavaUtil.java",
+        "rules/java/Jvm.java",
+        "rules/java/MessageBundleProvider.java",
+        "rules/java/NativeLibraryNestedSetBuilder.java",
+        "rules/java/SingleJarActionBuilder.java",
+        "rules/java/SourcesJavaCompilationArgsProvider.java",
+        "rules/java/WriteBuildInfoPropertiesAction.java",
+    ],
+    deps = [
+        ":build-base",
+        ":collect",
+        ":concurrent",
+        ":events",
+        ":java-implicit-attributes",
+        ":packages-internal",
+        ":shell",
+        ":skylarkinterface",
+        ":util",
+        ":vfs",
+        "//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/cpp",
+        "//src/main/java/com/google/devtools/common/options",
+        "//src/main/protobuf:extra_actions_base_java_proto",
+        "//third_party:guava",
+        "//third_party:joda_time",
+        "//third_party:jsr305",
+    ],
+)
+
+java_library(
     name = "java-implicit-attributes",
     srcs = ["rules/java/JavaImplicitAttributes.java"],
 )
@@ -754,6 +844,7 @@ java_library(
         ":collect",
         ":concurrent",
         ":events",
+        ":java-compilation",
         ":java-rules",
         ":nativedeps-rules",
         ":packages-internal",
@@ -806,6 +897,7 @@ java_library(
         ":build-base",
         ":collect",
         ":concurrent",
+        ":java-compilation",
         ":java-rules",
         ":packages-internal",
         ":util",
@@ -823,6 +915,7 @@ java_library(
     name = "shared-base-rules",
     exports = [
         ":android-rules",
+        ":java-compilation",
         ":java-rules",
         ":nativedeps-rules",
         ":proto-rules",
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 5c8d27f327..894634f57b 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
@@ -14,6 +14,7 @@ java_library(
         "//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",
+        "//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",