commit d57df7b471e667edb4efe953a5d31c2ad10415ef
author jcater <jcater@google.com> Mon Mar 30 14:34:55 2020 -0700
committer Copybara-Service <copybara-worker@google.com> Mon Mar 30 14:36:09 2020 -0700
tree eeb3cb713bb78392a820637b0b835f36bd59c3ba
parent 6d185b896541e0a2234d303edb0980c3b9932296

Split out BuildType (and related classes) to a new target separate from build/lib/packages:packages.

PiperOrigin-RevId: 303824990

src/main/java/com/google/devtools/build/lib/packages/BUILD

diff --git a/src/main/java/com/google/devtools/build/lib/packages/BUILD b/src/main/java/com/google/devtools/build/lib/packages/BUILD
index e796b3e..cfcc726 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/BUILD
+++ b/src/main/java/com/google/devtools/build/lib/packages/BUILD
@@ -10,17 +10,32 @@
     visibility = ["//src:__subpackages__"],
 )
 
+TYPE_SRCS = ["Type.java"]
+
+BUILD_TYPE_SRCS = [
+    "BuildType.java",
+    "FilesetEntry.java",
+    "License.java",
+    "SelectorList.java",
+    "SelectorValue.java",
+    "TriState.java",
+]
+
 java_library(
     name = "packages",
     srcs = glob(
         ["*.java"],
-        exclude = [
+        exclude = TYPE_SRCS + BUILD_TYPE_SRCS + [
             "BuilderFactoryForTesting.java",
             "StarlarkSemanticsOptions.java",
-            "Type.java",
         ],
     ),
+    # TODO(katre): Remove this when all dependencies are updated.
+    exports = [
+        ":build_type",
+    ],
     deps = [
+        ":build_type",
         ":type",
         "//src/main/java/com/google/devtools/build/lib:config-matching-provider",
         "//src/main/java/com/google/devtools/build/lib:config-transitions",
@@ -84,9 +99,7 @@
 
 java_library(
     name = "type",
-    srcs = [
-        "Type.java",
-    ],
+    srcs = TYPE_SRCS,
     deps = [
         "//src/main/java/com/google/devtools/build/lib:logging-util",
         "//src/main/java/com/google/devtools/build/lib:string_util",
@@ -98,3 +111,21 @@
         "//third_party:jsr305",
     ],
 )
+
+java_library(
+    name = "build_type",
+    srcs = BUILD_TYPE_SRCS,
+    deps = [
+        ":type",
+        "//src/main/java/com/google/devtools/build/lib/cmdline",
+        "//src/main/java/com/google/devtools/build/lib/concurrent",
+        "//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/skylarkinterface",
+        "//src/main/java/com/google/devtools/build/lib/syntax:evaluator",
+        "//src/main/java/com/google/devtools/build/lib/syntax:frontend",
+        "//src/main/java/com/google/devtools/build/lib/vfs:pathfragment",
+        "//third_party:guava",
+        "//third_party:jsr305",
+    ],
+)