diff --git a/src/main/java/com/google/devtools/build/lib/analysis/BUILD b/src/main/java/com/google/devtools/build/lib/analysis/BUILD index 9148224a775bee..5e4382bb74e09b 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/BUILD +++ b/src/main/java/com/google/devtools/build/lib/analysis/BUILD @@ -1866,10 +1866,8 @@ java_library( srcs = ["config/ExecutionTransitionFactory.java"], deps = [ ":config/build_options", - ":config/build_options_cache", ":config/core_options", ":config/fragment_options", - ":config/transitions/comparing_transition", ":config/transitions/configuration_transition", ":config/transitions/patch_transition", ":config/transitions/transition_factory", @@ -1880,7 +1878,7 @@ java_library( "//src/main/java/com/google/devtools/build/lib/packages", "//src/main/java/com/google/devtools/build/lib/packages:exec_group", "//src/main/java/com/google/devtools/build/lib/rules/config:feature_flag_value", - "//src/main/java/com/google/devtools/build/lib/starlarkbuildapi", + "//src/main/java/com/google/devtools/build/lib/starlarkbuildapi/config", "//src/main/java/com/google/devtools/build/lib/util:pair", "//third_party:caffeine", "//third_party:guava", @@ -2250,10 +2248,7 @@ java_library( deps = [ ":config/transitions/transition_factory", ":rule_definition_environment", - "//src/main/java/com/google/devtools/build/docgen/annot", "//src/main/java/com/google/devtools/build/lib/packages", - "//src/main/java/net/starlark/java/annot", - "//src/main/java/net/starlark/java/eval", ], ) @@ -2605,7 +2600,7 @@ java_library( deps = [ ":config/execution_transition_factory", "//src/main/java/com/google/devtools/build/lib/packages", - "//src/main/java/com/google/devtools/build/lib/starlarkbuildapi", + "//src/main/java/com/google/devtools/build/lib/starlarkbuildapi/config", "//src/main/java/net/starlark/java/eval", ], ) diff --git a/src/main/java/com/google/devtools/build/lib/analysis/config/ExecutionTransitionFactory.java b/src/main/java/com/google/devtools/build/lib/analysis/config/ExecutionTransitionFactory.java index 0c44911c5f7930..da02b7ae71b407 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/config/ExecutionTransitionFactory.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/config/ExecutionTransitionFactory.java @@ -32,7 +32,7 @@ import com.google.devtools.build.lib.events.EventHandler; import com.google.devtools.build.lib.packages.AttributeTransitionData; import com.google.devtools.build.lib.rules.config.FeatureFlagValue; -import com.google.devtools.build.lib.starlarkbuildapi.StarlarkConfigApi.ExecTransitionFactoryApi; +import com.google.devtools.build.lib.starlarkbuildapi.config.StarlarkConfigApi.ExecTransitionFactoryApi; import com.google.devtools.build.lib.util.Pair; import java.util.Map; import javax.annotation.Nullable; diff --git a/src/main/java/com/google/devtools/build/lib/analysis/starlark/StarlarkConfig.java b/src/main/java/com/google/devtools/build/lib/analysis/starlark/StarlarkConfig.java index 93c05a4b999699..e2fc73ec671f99 100644 --- a/src/main/java/com/google/devtools/build/lib/analysis/starlark/StarlarkConfig.java +++ b/src/main/java/com/google/devtools/build/lib/analysis/starlark/StarlarkConfig.java @@ -21,7 +21,7 @@ import com.google.devtools.build.lib.analysis.config.ExecutionTransitionFactory; import com.google.devtools.build.lib.packages.BuildSetting; -import com.google.devtools.build.lib.starlarkbuildapi.StarlarkConfigApi; +import com.google.devtools.build.lib.starlarkbuildapi.config.StarlarkConfigApi; import net.starlark.java.eval.EvalException; import net.starlark.java.eval.Printer; import net.starlark.java.eval.Starlark; 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 fb9f1f79aa93d4..0b9389fdfdd21f 100644 --- a/src/main/java/com/google/devtools/build/lib/packages/BUILD +++ b/src/main/java/com/google/devtools/build/lib/packages/BUILD @@ -93,6 +93,7 @@ java_library( "//src/main/java/com/google/devtools/build/lib/skyframe/serialization/autocodec", "//src/main/java/com/google/devtools/build/lib/skyframe/serialization/autocodec:serialization-constant", "//src/main/java/com/google/devtools/build/lib/starlarkbuildapi", + "//src/main/java/com/google/devtools/build/lib/starlarkbuildapi/config", "//src/main/java/com/google/devtools/build/lib/starlarkbuildapi/core", "//src/main/java/com/google/devtools/build/lib/util", "//src/main/java/com/google/devtools/build/lib/util:TestType", diff --git a/src/main/java/com/google/devtools/build/lib/packages/BuildSetting.java b/src/main/java/com/google/devtools/build/lib/packages/BuildSetting.java index d9b01dcca86316..023fef04dbda02 100644 --- a/src/main/java/com/google/devtools/build/lib/packages/BuildSetting.java +++ b/src/main/java/com/google/devtools/build/lib/packages/BuildSetting.java @@ -16,7 +16,7 @@ import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Preconditions; import com.google.devtools.build.lib.packages.Type.LabelClass; -import com.google.devtools.build.lib.starlarkbuildapi.StarlarkConfigApi.BuildSettingApi; +import com.google.devtools.build.lib.starlarkbuildapi.config.StarlarkConfigApi.BuildSettingApi; import net.starlark.java.eval.Printer; /** diff --git a/src/main/java/com/google/devtools/build/lib/starlarkbuildapi/BUILD b/src/main/java/com/google/devtools/build/lib/starlarkbuildapi/BUILD index 6b42cd28250a6b..73d750b304b5b9 100644 --- a/src/main/java/com/google/devtools/build/lib/starlarkbuildapi/BUILD +++ b/src/main/java/com/google/devtools/build/lib/starlarkbuildapi/BUILD @@ -51,6 +51,7 @@ java_library( # TODO(cparsons): Remove dependency on Label implementation. "//src/main/java/com/google/devtools/build/lib/cmdline", "//src/main/java/com/google/devtools/build/lib/starlarkbuildapi/core", + "//src/main/java/com/google/devtools/build/lib/starlarkbuildapi/config", "//src/main/java/com/google/devtools/build/lib/starlarkbuildapi/platform", "//third_party:jsr305", ], diff --git a/src/main/java/com/google/devtools/build/lib/starlarkbuildapi/StarlarkRuleFunctionsApi.java b/src/main/java/com/google/devtools/build/lib/starlarkbuildapi/StarlarkRuleFunctionsApi.java index 24731a5d7dfff1..c2e9ceb9511131 100644 --- a/src/main/java/com/google/devtools/build/lib/starlarkbuildapi/StarlarkRuleFunctionsApi.java +++ b/src/main/java/com/google/devtools/build/lib/starlarkbuildapi/StarlarkRuleFunctionsApi.java @@ -19,7 +19,7 @@ import com.google.devtools.build.docgen.annot.StarlarkConstructor; import com.google.devtools.build.lib.cmdline.Label; import com.google.devtools.build.lib.packages.semantics.BuildLanguageOptions; -import com.google.devtools.build.lib.starlarkbuildapi.StarlarkConfigApi.BuildSettingApi; +import com.google.devtools.build.lib.starlarkbuildapi.config.StarlarkConfigApi.BuildSettingApi; import net.starlark.java.annot.Param; import net.starlark.java.annot.ParamType; import net.starlark.java.annot.StarlarkMethod; diff --git a/src/main/java/com/google/devtools/build/lib/starlarkbuildapi/config/BUILD b/src/main/java/com/google/devtools/build/lib/starlarkbuildapi/config/BUILD index 532610004d8d19..fe7406b8a1b07c 100644 --- a/src/main/java/com/google/devtools/build/lib/starlarkbuildapi/config/BUILD +++ b/src/main/java/com/google/devtools/build/lib/starlarkbuildapi/config/BUILD @@ -39,9 +39,7 @@ java_library( deps = [ ":starlark_toolchain_type_requirement", "//src/main/java/com/google/devtools/build/docgen/annot", - "//src/main/java/com/google/devtools/build/lib/analysis:config/transitions/starlark_exposed_rule_transition_factory", "//src/main/java/com/google/devtools/build/lib/cmdline", - "//src/main/java/com/google/devtools/build/lib/starlarkbuildapi", "//src/main/java/com/google/devtools/build/lib/starlarkbuildapi/core", "//src/main/java/net/starlark/java/annot", "//src/main/java/net/starlark/java/eval", diff --git a/src/main/java/com/google/devtools/build/lib/starlarkbuildapi/config/ConfigBootstrap.java b/src/main/java/com/google/devtools/build/lib/starlarkbuildapi/config/ConfigBootstrap.java index e60c40894c9e6c..a439460318c764 100644 --- a/src/main/java/com/google/devtools/build/lib/starlarkbuildapi/config/ConfigBootstrap.java +++ b/src/main/java/com/google/devtools/build/lib/starlarkbuildapi/config/ConfigBootstrap.java @@ -15,7 +15,6 @@ package com.google.devtools.build.lib.starlarkbuildapi.config; import com.google.common.collect.ImmutableMap.Builder; -import com.google.devtools.build.lib.starlarkbuildapi.StarlarkConfigApi; import com.google.devtools.build.lib.starlarkbuildapi.core.Bootstrap; import net.starlark.java.eval.Starlark; diff --git a/src/main/java/com/google/devtools/build/lib/starlarkbuildapi/StarlarkConfigApi.java b/src/main/java/com/google/devtools/build/lib/starlarkbuildapi/config/StarlarkConfigApi.java similarity index 99% rename from src/main/java/com/google/devtools/build/lib/starlarkbuildapi/StarlarkConfigApi.java rename to src/main/java/com/google/devtools/build/lib/starlarkbuildapi/config/StarlarkConfigApi.java index 6b2446bf73293a..d15cba4200e56e 100644 --- a/src/main/java/com/google/devtools/build/lib/starlarkbuildapi/StarlarkConfigApi.java +++ b/src/main/java/com/google/devtools/build/lib/starlarkbuildapi/config/StarlarkConfigApi.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.devtools.build.lib.starlarkbuildapi; +package com.google.devtools.build.lib.starlarkbuildapi.config; import com.google.devtools.build.docgen.annot.DocCategory; import net.starlark.java.annot.Param; diff --git a/src/main/java/com/google/devtools/build/skydoc/fakebuildapi/FakeApi.java b/src/main/java/com/google/devtools/build/skydoc/fakebuildapi/FakeApi.java index 9b387a44b3d9d2..e9a0d51056e5d0 100644 --- a/src/main/java/com/google/devtools/build/skydoc/fakebuildapi/FakeApi.java +++ b/src/main/java/com/google/devtools/build/skydoc/fakebuildapi/FakeApi.java @@ -18,6 +18,7 @@ import com.google.devtools.build.lib.starlarkbuildapi.config.ConfigBootstrap; import com.google.devtools.build.lib.starlarkbuildapi.repository.RepositoryBootstrap; import com.google.devtools.build.skydoc.fakebuildapi.FakeStructApi.FakeStructProviderApi; +import com.google.devtools.build.skydoc.fakebuildapi.config.FakeConfigApi; import com.google.devtools.build.skydoc.fakebuildapi.config.FakeConfigGlobalLibrary; import com.google.devtools.build.skydoc.fakebuildapi.config.FakeConfigStarlarkCommon; import com.google.devtools.build.skydoc.fakebuildapi.repository.FakeRepositoryModule; diff --git a/src/main/java/com/google/devtools/build/skydoc/fakebuildapi/ConfigApiFakes.java b/src/main/java/com/google/devtools/build/skydoc/fakebuildapi/config/ConfigApiFakes.java similarity index 77% rename from src/main/java/com/google/devtools/build/skydoc/fakebuildapi/ConfigApiFakes.java rename to src/main/java/com/google/devtools/build/skydoc/fakebuildapi/config/ConfigApiFakes.java index 919a5433bec5fa..fac3d89053662c 100644 --- a/src/main/java/com/google/devtools/build/skydoc/fakebuildapi/ConfigApiFakes.java +++ b/src/main/java/com/google/devtools/build/skydoc/fakebuildapi/config/ConfigApiFakes.java @@ -12,11 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.devtools.build.skydoc.fakebuildapi; +package com.google.devtools.build.skydoc.fakebuildapi.config; -import com.google.devtools.build.lib.starlarkbuildapi.StarlarkConfigApi; -import com.google.devtools.build.lib.starlarkbuildapi.StarlarkConfigApi.BuildSettingApi; -import com.google.devtools.build.lib.starlarkbuildapi.StarlarkConfigApi.ExecTransitionFactoryApi; +import com.google.devtools.build.lib.starlarkbuildapi.config.StarlarkConfigApi; +import com.google.devtools.build.lib.starlarkbuildapi.config.StarlarkConfigApi.BuildSettingApi; +import com.google.devtools.build.lib.starlarkbuildapi.config.StarlarkConfigApi.ExecTransitionFactoryApi; import net.starlark.java.eval.Printer; /** Fakes for callables under the {@link StarlarkConfigApi} module. */ diff --git a/src/main/java/com/google/devtools/build/skydoc/fakebuildapi/FakeConfigApi.java b/src/main/java/com/google/devtools/build/skydoc/fakebuildapi/config/FakeConfigApi.java similarity index 80% rename from src/main/java/com/google/devtools/build/skydoc/fakebuildapi/FakeConfigApi.java rename to src/main/java/com/google/devtools/build/skydoc/fakebuildapi/config/FakeConfigApi.java index 0582beb4d71b73..5d768d153ed3aa 100644 --- a/src/main/java/com/google/devtools/build/skydoc/fakebuildapi/FakeConfigApi.java +++ b/src/main/java/com/google/devtools/build/skydoc/fakebuildapi/config/FakeConfigApi.java @@ -12,11 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -package com.google.devtools.build.skydoc.fakebuildapi; +package com.google.devtools.build.skydoc.fakebuildapi.config; -import com.google.devtools.build.lib.starlarkbuildapi.StarlarkConfigApi; -import com.google.devtools.build.skydoc.fakebuildapi.ConfigApiFakes.FakeBuildSettingDescriptor; -import com.google.devtools.build.skydoc.fakebuildapi.ConfigApiFakes.FakeExecTransitionFactory; +import com.google.devtools.build.lib.starlarkbuildapi.config.StarlarkConfigApi; +import com.google.devtools.build.skydoc.fakebuildapi.config.ConfigApiFakes.FakeBuildSettingDescriptor; +import com.google.devtools.build.skydoc.fakebuildapi.config.ConfigApiFakes.FakeExecTransitionFactory; import net.starlark.java.eval.Printer; /** Fake implementation of {@link StarlarkConfigApi}. */