Rename Factory-level ExecutionTransitionFactory.create to createFactory
This also provides better consistency with other TransitionFactory that only use `create` to return Transition.
PiperOrigin-RevId: 520458312
Change-Id: Icc0a2e208a2777ab34651fbd7c46f9974dad87ae
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/Allowlist.java b/src/main/java/com/google/devtools/build/lib/analysis/Allowlist.java
index d6593d1..372364b 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/Allowlist.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/Allowlist.java
@@ -50,7 +50,7 @@
public static Attribute.Builder<Label> getAttributeFromAllowlistName(String allowlistName) {
String attributeName = getAttributeNameFromAllowlistName(allowlistName).iterator().next();
return attr(attributeName, LABEL)
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.mandatoryProviders(PackageGroupConfiguredTarget.PROVIDER.id());
}
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/BaseRuleClasses.java b/src/main/java/com/google/devtools/build/lib/analysis/BaseRuleClasses.java
index 772b0c3..4045acc 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/BaseRuleClasses.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/BaseRuleClasses.java
@@ -215,31 +215,31 @@
// Input files for every test action
.add(
attr("$test_wrapper", LABEL)
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.singleArtifact()
.value(env.getToolsLabel("//tools/test:test_wrapper")))
.add(
attr("$xml_writer", LABEL)
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.singleArtifact()
.value(env.getToolsLabel("//tools/test:xml_writer")))
.add(
attr("$test_runtime", LABEL_LIST)
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.value(getTestRuntimeLabelList(env)))
.add(
attr("$test_setup_script", LABEL)
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.singleArtifact()
.value(env.getToolsLabel("//tools/test:test_setup")))
.add(
attr("$xml_generator_script", LABEL)
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.singleArtifact()
.value(env.getToolsLabel("//tools/test:test_xml_generator")))
.add(
attr("$collect_coverage_script", LABEL)
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.singleArtifact()
.value(env.getToolsLabel("//tools/test:collect_coverage")))
// Input files for test actions collecting code coverage
@@ -250,7 +250,7 @@
// Used in the one-per-build coverage report generation action.
.add(
attr(":coverage_report_generator", LABEL)
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.value(
coverageReportGeneratorAttribute(
env.getToolsLabel(DEFAULT_COVERAGE_REPORT_GENERATOR_VALUE))))
@@ -313,7 +313,7 @@
.add(
attr("visibility", NODEP_LABEL_LIST)
.orderIndependent()
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.nonconfigurable(
"special attribute integrated more deeply into Bazel's core logic"))
.add(
@@ -348,12 +348,12 @@
.add(attr("features", STRING_LIST).orderIndependent())
.add(
attr(":action_listener", LABEL_LIST)
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.value(ACTION_LISTENER))
.add(
attr(RuleClass.COMPATIBLE_ENVIRONMENT_ATTR, LABEL_LIST)
.allowedRuleClasses(ConstraintConstants.ENVIRONMENT_RULE)
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.allowedFileTypes(FileTypeSet.NO_FILE)
.dontCheckConstraints()
.nonconfigurable(
@@ -361,7 +361,7 @@
.add(
attr(RuleClass.RESTRICTED_ENVIRONMENT_ATTR, LABEL_LIST)
.allowedRuleClasses(ConstraintConstants.ENVIRONMENT_RULE)
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.allowedFileTypes(FileTypeSet.NO_FILE)
.dontCheckConstraints()
.nonconfigurable(
@@ -371,7 +371,7 @@
.nonconfigurable("stores configurability keys"))
.add(
attr(RuleClass.APPLICABLE_LICENSES_ATTR, LABEL_LIST)
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.allowedFileTypes(FileTypeSet.NO_FILE)
// TODO(b/148601291): Require provider to be "LicenseInfo".
.dontCheckConstraints()
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 d82bd1a..a613ff3 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
@@ -44,7 +44,7 @@
* Returns a new {@link ExecutionTransitionFactory} for the default {@link
* com.google.devtools.build.lib.packages.ExecGroup}.
*/
- public static ExecutionTransitionFactory create() {
+ public static ExecutionTransitionFactory createFactory() {
return new ExecutionTransitionFactory(DEFAULT_EXEC_GROUP_NAME);
}
@@ -52,7 +52,7 @@
* Returns a new {@link ExecutionTransitionFactory} for the given {@link
* com.google.devtools.build.lib.packages.ExecGroup}.
*/
- public static ExecutionTransitionFactory create(String execGroup) {
+ public static ExecutionTransitionFactory createFactory(String execGroup) {
return new ExecutionTransitionFactory(execGroup);
}
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/starlark/StarlarkAttrModule.java b/src/main/java/com/google/devtools/build/lib/analysis/starlark/StarlarkAttrModule.java
index bfca6ed..72520c8 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/starlark/StarlarkAttrModule.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/starlark/StarlarkAttrModule.java
@@ -244,9 +244,9 @@
"'cfg = \"host\"' is deprecated and should no longer be used. Please use "
+ "'cfg = \"exec\"' instead.");
}
- builder.cfg(ExecutionTransitionFactory.create());
+ builder.cfg(ExecutionTransitionFactory.createFactory());
} else if (trans.equals("exec")) {
- builder.cfg(ExecutionTransitionFactory.create());
+ builder.cfg(ExecutionTransitionFactory.createFactory());
} else if (trans instanceof ExecutionTransitionFactory) {
builder.cfg((ExecutionTransitionFactory) trans);
} else if (trans instanceof SplitTransition) {
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 d583cb0..801b2f1 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
@@ -55,8 +55,8 @@
@Override
public ExecutionTransitionFactory exec(Object execGroupUnchecked) {
return execGroupUnchecked == Starlark.NONE
- ? ExecutionTransitionFactory.create()
- : ExecutionTransitionFactory.create((String) execGroupUnchecked);
+ ? ExecutionTransitionFactory.createFactory()
+ : ExecutionTransitionFactory.createFactory((String) execGroupUnchecked);
}
@Override
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/starlark/StarlarkRuleClassFunctions.java b/src/main/java/com/google/devtools/build/lib/analysis/starlark/StarlarkRuleClassFunctions.java
index ef6642b..2e95ec5 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/starlark/StarlarkRuleClassFunctions.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/starlark/StarlarkRuleClassFunctions.java
@@ -195,39 +195,39 @@
// Input files for every test action
.add(
attr("$test_wrapper", LABEL)
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.singleArtifact()
.value(labelCache.get(toolsRepository + "//tools/test:test_wrapper")))
.add(
attr("$xml_writer", LABEL)
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.singleArtifact()
.value(labelCache.get(toolsRepository + "//tools/test:xml_writer")))
.add(
attr("$test_runtime", LABEL_LIST)
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
// Getting this default value through the getTestRuntimeLabelList helper ensures
// we reuse the same ImmutableList<Label> instance for each $test_runtime attr.
.value(getTestRuntimeLabelList(env)))
.add(
attr("$test_setup_script", LABEL)
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.singleArtifact()
.value(labelCache.get(toolsRepository + "//tools/test:test_setup")))
.add(
attr("$xml_generator_script", LABEL)
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.singleArtifact()
.value(labelCache.get(toolsRepository + "//tools/test:test_xml_generator")))
.add(
attr("$collect_coverage_script", LABEL)
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.singleArtifact()
.value(labelCache.get(toolsRepository + "//tools/test:collect_coverage")))
// Input files for test actions collecting code coverage
.add(
attr(":coverage_support", LABEL)
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.value(
BaseRuleClasses.coverageSupportAttribute(
labelCache.get(
@@ -235,7 +235,7 @@
// Used in the one-per-build coverage report generation action.
.add(
attr(":coverage_report_generator", LABEL)
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.value(
BaseRuleClasses.coverageReportGeneratorAttribute(
labelCache.get(
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/BazelAndroidLocalTestRule.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/BazelAndroidLocalTestRule.java
index 7c60810..375abbe 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/BazelAndroidLocalTestRule.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/BazelAndroidLocalTestRule.java
@@ -86,7 +86,7 @@
.removeAttribute(":java_launcher") // Input files for test actions collecting code coverage
.add(
attr(":lcov_merger", LABEL)
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.value(BaseRuleClasses.getCoverageOutputGeneratorLabel()))
.cfg(
new ConfigFeatureFlagTransitionFactory(AndroidFeatureFlagSetProvider.FEATURE_FLAG_ATTR))
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/cpp/BazelCcTestRule.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/cpp/BazelCcTestRule.java
index 8181dd8..d6b5942 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/cpp/BazelCcTestRule.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/cpp/BazelCcTestRule.java
@@ -50,11 +50,11 @@
.override(attr("stamp", TRISTATE).value(TriState.NO))
.add(
attr(":lcov_merger", LABEL)
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.value(BaseRuleClasses.getCoverageOutputGeneratorLabel()))
.add(
attr("$collect_cc_coverage", LABEL)
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.singleArtifact()
.value(env.getToolsLabel("//tools/test:collect_cc_coverage")))
.build();
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/cpp/BazelCppRuleClasses.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/cpp/BazelCppRuleClasses.java
index f32532a..1bb5d88 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/cpp/BazelCppRuleClasses.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/cpp/BazelCppRuleClasses.java
@@ -368,7 +368,7 @@
.add(attr("linkstatic", BOOLEAN).value(true))
.add(
attr("$def_parser", LABEL)
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.singleArtifact()
.value(
new Attribute.ComputedDefault() {
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/genrule/BazelGenRuleRule.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/genrule/BazelGenRuleRule.java
index 2b8f89a..685925c 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/genrule/BazelGenRuleRule.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/genrule/BazelGenRuleRule.java
@@ -41,7 +41,7 @@
.setOutputToGenfiles()
.add(
attr("$genrule_setup", LABEL)
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.value(env.getToolsLabel(GENRULE_SETUP_LABEL)))
// TODO(bazel-team): stamping doesn't seem to work. Fix it or remove attribute.
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/java/BazelJavaLibraryRule.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/java/BazelJavaLibraryRule.java
index 9e0d096..6408f48 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/java/BazelJavaLibraryRule.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/java/BazelJavaLibraryRule.java
@@ -151,7 +151,7 @@
<!-- #END_BLAZE_RULE.ATTRIBUTE --> */
.add(
attr("exported_plugins", LABEL_LIST)
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.mandatoryProviders(JavaPluginInfo.PROVIDER.id())
.allowedFileTypes())
.advertiseStarlarkProvider(StarlarkProviderIdentifier.forKey(JavaInfo.PROVIDER.getKey()))
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/java/BazelJavaRuleClasses.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/java/BazelJavaRuleClasses.java
index 7d1bd9c..a23da5f 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/java/BazelJavaRuleClasses.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/java/BazelJavaRuleClasses.java
@@ -239,12 +239,12 @@
<!-- #END_BLAZE_RULE.ATTRIBUTE --> */
.add(
attr("plugins", LABEL_LIST)
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.mandatoryProviders(JavaPluginInfo.PROVIDER.id())
.legacyAllowAnyFileType())
.add(
attr(":java_plugins", LABEL_LIST)
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.mandatoryProviders(JavaPluginInfo.PROVIDER.id())
.silentRuleClassFilter()
.value(JavaSemantics.JAVA_PLUGINS))
@@ -441,7 +441,7 @@
.add(attr(":java_launcher", LABEL).value(JavaSemantics.JAVA_LAUNCHER)) // blaze flag
.add(
attr("$launcher", LABEL)
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.value(env.getToolsLabel("//tools/launcher:launcher")))
.build();
}
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/java/BazelJavaTestRule.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/java/BazelJavaTestRule.java
index 09a7982..9635521 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/java/BazelJavaTestRule.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/java/BazelJavaTestRule.java
@@ -58,13 +58,13 @@
// Input files for test actions collecting code coverage
.add(
attr(":lcov_merger", LABEL)
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.value(BaseRuleClasses.getCoverageOutputGeneratorLabel()))
// Add the script as an attribute in order for java_test to output code coverage results for
// code covered by CC binaries invocations.
.add(
attr("$collect_cc_coverage", LABEL)
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.singleArtifact()
.value(env.getToolsLabel("//tools/test:collect_cc_coverage")))
/* <!-- #BLAZE_RULE(java_test).ATTRIBUTE(test_class) -->
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/sh/BazelShBinaryRule.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/sh/BazelShBinaryRule.java
index 9b69fe3..260478f 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/sh/BazelShBinaryRule.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/sh/BazelShBinaryRule.java
@@ -32,7 +32,7 @@
return builder
.add(
attr("$launcher", LABEL)
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.value(environment.getToolsLabel("//tools/launcher:launcher")))
.build();
}
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/sh/BazelShTestRule.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/sh/BazelShTestRule.java
index e76fa64..2513d48 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/sh/BazelShTestRule.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/sh/BazelShTestRule.java
@@ -34,17 +34,17 @@
builder
.add(
attr(":lcov_merger", LABEL)
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.value(BaseRuleClasses.getCoverageOutputGeneratorLabel()))
.add(
attr("$launcher", LABEL)
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.value(environment.getToolsLabel("//tools/launcher:launcher")))
// Add the script as an attribute in order for sh_test to output code coverage results for
// code covered by CC binaries invocations.
.add(
attr("$collect_cc_coverage", LABEL)
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.singleArtifact()
.value(environment.getToolsLabel("//tools/test:collect_cc_coverage")));
return builder.build();
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AarImportBaseRule.java b/src/main/java/com/google/devtools/build/lib/rules/android/AarImportBaseRule.java
index 279506a..fa79011 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/AarImportBaseRule.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/AarImportBaseRule.java
@@ -64,32 +64,32 @@
.direct_compile_time_input())
.add(
attr(AAR_EMBEDDED_JARS_EXTACTOR, LABEL)
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.exec()
.value(env.getToolsLabel("//tools/android:aar_embedded_jars_extractor")))
.add(
attr(AAR_EMBEDDED_PROGUARD_EXTACTOR, LABEL)
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.exec()
.value(env.getToolsLabel("//tools/android:aar_embedded_proguard_extractor")))
.add(
attr(AAR_NATIVE_LIBS_ZIP_CREATOR, LABEL)
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.exec()
.value(env.getToolsLabel("//tools/android:aar_native_libs_zip_creator")))
.add(
attr(AAR_RESOURCES_EXTRACTOR, LABEL)
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.exec()
.value(env.getToolsLabel("//tools/android:aar_resources_extractor")))
.add(
attr("$import_deps_checker", LABEL)
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.exec()
.value(env.getToolsLabel("//tools/android:aar_import_deps_checker")))
.add(
attr(ZIPPER, LABEL)
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.exec()
.value(env.getToolsLabel("//tools/zip:zipper")))
.advertiseStarlarkProvider(StarlarkProviderIdentifier.forKey(JavaInfo.PROVIDER.getKey()))
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidDeviceRule.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidDeviceRule.java
index 4527fc0..2022151 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidDeviceRule.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidDeviceRule.java
@@ -104,7 +104,7 @@
<!-- #END_BLAZE_RULE.ATTRIBUTE --> */
.add(
attr("default_properties", LABEL)
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.allowedFileTypes(JavaSemantics.PROPERTIES))
/* <!-- #BLAZE_RULE(android_device).ATTRIBUTE(platform_apks) -->
A list of apks to be installed on the device at boot time.
@@ -115,54 +115,54 @@
.add(attr("pregenerate_oat_files_for_tests", BOOLEAN).value(false))
.add(
attr("$adb_static", LABEL)
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.value(env.getToolsLabel("//tools/android:adb_static")))
.add(
attr("$adb", LABEL)
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.value(env.getToolsLabel("//tools/android:adb")))
.add(
attr("$emulator_arm", LABEL)
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.value(env.getToolsLabel("//tools/android/emulator:emulator_arm")))
.add(
attr("$emulator_x86", LABEL)
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.value(env.getToolsLabel("//tools/android/emulator:emulator_x86")))
.add(
attr("$emulator_x86_bios", LABEL)
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.value(env.getToolsLabel("//tools/android/emulator:emulator_x86_bios")))
.add(
attr("$mksd", LABEL)
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.exec()
.value(env.getToolsLabel("//tools/android/emulator:mksd")))
.add(
attr("$empty_snapshot_fs", LABEL)
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.value(env.getToolsLabel("//tools/android/emulator:empty_snapshot_fs")))
.add(
attr("$xvfb_support", LABEL)
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.value(env.getToolsLabel("//tools/android/emulator:xvfb_support")))
.add(
attr("$unified_launcher", LABEL)
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.exec()
.value(env.getToolsLabel("//tools/android/emulator:unified_launcher")))
.add(
attr("$android_runtest", LABEL)
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.exec()
.value(env.getToolsLabel("//tools/android:android_runtest")))
.add(
attr("$testing_shbase", LABEL)
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.value(env.getToolsLabel("//tools/android/emulator:shbase")))
.add(
attr("$sdk_path", LABEL)
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.exec()
.value(env.getToolsLabel("//tools/android/emulator:sdk_path")))
.add(
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidHostServiceFixtureRule.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidHostServiceFixtureRule.java
index 41956b6..c39ef4d5 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidHostServiceFixtureRule.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidHostServiceFixtureRule.java
@@ -41,7 +41,7 @@
.add(
attr("executable", LABEL)
.exec()
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.mandatory()
.allowedFileTypes())
.add(attr("service_names", STRING_LIST))
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidInstrumentationTestBaseRule.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidInstrumentationTestBaseRule.java
index eeda565..3a280e7 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidInstrumentationTestBaseRule.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidInstrumentationTestBaseRule.java
@@ -52,7 +52,7 @@
attr("target_device", LABEL)
.mandatory()
.exec()
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.allowedFileTypes(FileTypeSet.NO_FILE)
.mandatoryProviders(
StarlarkProviderIdentifier.forKey(AndroidDeviceBrokerInfo.PROVIDER.getKey())))
@@ -72,7 +72,7 @@
.add(
attr("$test_entry_point", LABEL)
.exec()
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.value(
environment.getToolsLabel("//tools/android:instrumentation_test_entry_point")))
.build();
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLibraryBaseRule.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLibraryBaseRule.java
index f995cc6..b8920d5 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLibraryBaseRule.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLibraryBaseRule.java
@@ -115,7 +115,7 @@
<!-- #END_BLAZE_RULE.ATTRIBUTE --> */
.add(
attr("exported_plugins", LABEL_LIST)
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.mandatoryProviders(JavaPluginInfo.PROVIDER.id())
.allowedFileTypes(FileTypeSet.NO_FILE))
.add(attr("alwayslink", BOOLEAN).undocumented("purely informational for now"))
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLocalTestBaseRule.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLocalTestBaseRule.java
index a5dc115..abf9eac 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLocalTestBaseRule.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLocalTestBaseRule.java
@@ -96,7 +96,7 @@
// rule so they're not defined in multiple places
.add(
attr("$android_resources_busybox", LABEL)
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.exec()
.value(environment.getToolsLabel(AndroidRuleClasses.DEFAULT_RESOURCES_BUSYBOX)))
.add(
@@ -152,12 +152,12 @@
// processed XML expressions into Java code.
.add(
attr(DataBinding.DATABINDING_ANNOTATION_PROCESSOR_ATTR, LABEL)
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.value(
environment.getToolsLabel("//tools/android:databinding_annotation_processor")))
.add(
attr(DataBinding.DATABINDING_EXEC_PROCESSOR_ATTR, LABEL)
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.exec()
.value(environment.getToolsLabel("//tools/android:databinding_exec")))
/* <!-- #BLAZE_RULE($android_local_test_base).ATTRIBUTE(nocompress_extensions) -->
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidRuleClasses.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidRuleClasses.java
index 6f37d5d..e7eae73 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidRuleClasses.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidRuleClasses.java
@@ -375,11 +375,11 @@
// processed XML expressions into Java code.
.add(
attr(DataBinding.DATABINDING_ANNOTATION_PROCESSOR_ATTR, LABEL)
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.value(env.getToolsLabel("//tools/android:databinding_annotation_processor")))
.add(
attr(DataBinding.DATABINDING_EXEC_PROCESSOR_ATTR, LABEL)
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.exec()
.value(env.getToolsLabel("//tools/android:databinding_exec")))
.advertiseStarlarkProvider(
@@ -418,12 +418,12 @@
<!-- #END_BLAZE_RULE.ATTRIBUTE --> */
.add(
attr("plugins", LABEL_LIST)
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.mandatoryProviders(JavaPluginInfo.PROVIDER.id())
.legacyAllowAnyFileType())
.add(
attr(":java_plugins", LABEL_LIST)
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.mandatoryProviders(JavaPluginInfo.PROVIDER.id())
.silentRuleClassFilter()
.value(JavaSemantics.JAVA_PLUGINS))
@@ -437,16 +437,16 @@
.add(attr("javacopts", STRING_LIST))
.add(
attr("$idlclass", LABEL)
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.exec()
.value(env.getToolsLabel("//tools/android:IdlClass")))
.add(
attr("$desugar_java8_extra_bootclasspath", LABEL)
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.value(env.getToolsLabel("//tools/android:desugar_java8_extra_bootclasspath")))
.add(
attr("$android_resources_busybox", LABEL)
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.exec()
.value(env.getToolsLabel(DEFAULT_RESOURCES_BUSYBOX)))
.build();
@@ -526,7 +526,7 @@
<!-- #END_BLAZE_RULE.ATTRIBUTE --> */
.add(
attr("debug_key", LABEL)
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.legacyAllowAnyFileType()
.value(env.getToolsLabel("//tools/android:debug_keystore")))
/* <!-- #BLAZE_RULE($android_binary_base).ATTRIBUTE(debug_signing_keys) -->
@@ -537,7 +537,7 @@
<!-- #END_BLAZE_RULE.ATTRIBUTE --> */
.add(
attr("debug_signing_keys", LABEL_LIST)
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.legacyAllowAnyFileType())
/* <!-- #BLAZE_RULE($android_binary_base).ATTRIBUTE(debug_signing_lineage_file) -->
File containing the signing lineage for the debug_signing_keys. Usually you do not
@@ -547,7 +547,7 @@
<!-- #END_BLAZE_RULE.ATTRIBUTE --> */
.add(
attr("debug_signing_lineage_file", LABEL)
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.legacyAllowAnyFileType())
/* <!-- #BLAZE_RULE($android_binary_base).ATTRIBUTE(key_rotation_min_sdk) -->
Sets the minimum Android platform version (API Level) for which an APK's rotated signing
@@ -616,57 +616,57 @@
.add(attr(ResourceFilterFactory.DENSITIES_NAME, STRING_LIST))
.add(
attr("$build_incremental_dexmanifest", LABEL)
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.exec()
.value(env.getToolsLabel(BUILD_INCREMENTAL_DEXMANIFEST_LABEL)))
.add(
attr("$stubify_manifest", LABEL)
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.exec()
.value(env.getToolsLabel(STUBIFY_MANIFEST_LABEL)))
.add(
attr("$shuffle_jars", LABEL)
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.exec()
.value(env.getToolsLabel("//tools/android:shuffle_jars")))
.add(
attr("$dexbuilder", LABEL)
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.exec()
.value(env.getToolsLabel("//tools/android:dexbuilder")))
.add(
attr("$dexbuilder_after_proguard", LABEL)
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.exec()
.value(env.getToolsLabel("//tools/android:dexbuilder_after_proguard")))
.add(
attr("$dexsharder", LABEL)
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.exec()
.value(env.getToolsLabel("//tools/android:dexsharder")))
.add(
attr("$dexmerger", LABEL)
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.exec()
.value(env.getToolsLabel("//tools/android:dexmerger")))
.add(
attr("$merge_dexzips", LABEL)
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.exec()
.value(env.getToolsLabel("//tools/android:merge_dexzips")))
.add(
attr("$incremental_install", LABEL)
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.exec()
.value(env.getToolsLabel(INCREMENTAL_INSTALL_LABEL)))
.add(
attr("$build_split_manifest", LABEL)
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.exec()
.value(env.getToolsLabel(BUILD_SPLIT_MANIFEST_LABEL)))
.add(
attr("$strip_resources", LABEL)
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.exec()
.value(env.getToolsLabel(STRIP_RESOURCES_LABEL)))
.add(
@@ -679,7 +679,7 @@
.aspect(dexArchiveAspect, DexArchiveAspect.ONLY_DESUGAR_JAVA8))
.add(
attr("$desugar", LABEL)
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.exec()
.value(env.getToolsLabel("//tools/android:desugar_java8")))
.add(
@@ -687,7 +687,7 @@
.value(env.getToolsLabel("//tools/android:java8_legacy_dex")))
.add(
attr("$build_java8_legacy_dex", LABEL)
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.exec()
.value(env.getToolsLabel("//tools/android:build_java8_legacy_dex")))
.add(
@@ -695,7 +695,7 @@
.value(env.getToolsLabel("//tools/android:desugared_java8_legacy_apis")))
.add(
attr("$merge_proguard_maps", LABEL)
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.exec()
.value(env.getToolsLabel("//tools/android:merge_proguard_maps")))
/* <!-- #BLAZE_RULE($android_binary_base).ATTRIBUTE(dexopts) -->
@@ -799,12 +799,12 @@
.add(attr("proguard_apply_dictionary", LABEL).legacyAllowAnyFileType())
.add(
attr("$dex_list_obfuscator", LABEL)
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.exec()
.value(env.getToolsLabel("//tools/android:dex_list_obfuscator")))
.add(
attr(":bytecode_optimizer", LABEL)
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.value(JavaSemantics.BYTECODE_OPTIMIZER))
// We need the C++ toolchain for every sub-configuration to get the correct linker.
.add(
@@ -834,7 +834,7 @@
// deploy jar so that they can be added to the APK.
.add(
attr("$resource_extractor", LABEL)
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.exec()
.value(env.getToolsLabel("//tools/android:resource_extractor")))
/* <!-- #BLAZE_RULE(android_binary).ATTRIBUTE(instruments) -->
@@ -850,7 +850,7 @@
.allowedFileTypes(NO_FILE))
.add(
attr("$instrumentation_test_check", LABEL)
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.value(
new Attribute.ComputedDefault() {
@Override
@@ -864,7 +864,7 @@
.exec())
.add(
attr("$zip_filter", LABEL)
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.exec()
.value(env.getToolsLabel("//tools/android:zip_filter")))
/* <!-- #BLAZE_RULE($android_binary_base).ATTRIBUTE(package_id) -->
@@ -890,7 +890,7 @@
// This comes from the --legacy_main_dex_list_generator flag.
.add(
attr(":legacy_main_dex_list_generator", LABEL)
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.value(LEGACY_MAIN_DEX_LIST_GENERATOR)
.exec())
.removeAttribute("data")
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidSdkBaseRule.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidSdkBaseRule.java
index b059167..3cd7b2a 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidSdkBaseRule.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidSdkBaseRule.java
@@ -41,7 +41,7 @@
// This is the Proguard that comes from the --proguard_top attribute.
.add(
attr(":proguard", LABEL)
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.value(JavaSemantics.PROGUARD)
.exec())
// This is the Proguard in the BUILD file that contains the android_sdk rule. Used when
@@ -49,88 +49,88 @@
.add(
attr("proguard", LABEL)
.mandatory()
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.allowedFileTypes(ANY_FILE)
.exec())
.add(
attr("aapt", LABEL)
.mandatory()
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.allowedFileTypes(ANY_FILE)
.exec())
.add(
attr("aapt2", LABEL)
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.allowedFileTypes(ANY_FILE)
.exec())
.add(
attr("dx", LABEL)
.mandatory()
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.allowedFileTypes(ANY_FILE)
.exec())
.add(
attr("main_dex_list_creator", LABEL)
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.allowedFileTypes(ANY_FILE)
.exec())
.add(
attr("adb", LABEL)
.mandatory()
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.allowedFileTypes(ANY_FILE)
.exec())
.add(
attr("framework_aidl", LABEL)
.mandatory()
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.allowedFileTypes(ANY_FILE))
.add(
attr("aidl", LABEL)
.mandatory()
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.allowedFileTypes(ANY_FILE)
.exec())
.add(attr("aidl_lib", LABEL).allowedFileTypes(JavaSemantics.JAR))
.add(
attr("android_jar", LABEL)
.mandatory()
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.allowedFileTypes(JavaSemantics.JAR))
// TODO(b/67903726): Make this attribute mandatory after updating all android_sdk rules.
.add(
attr("source_properties", LABEL)
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.allowedFileTypes(ANY_FILE))
.add(
attr("shrinked_android_jar", LABEL)
.mandatory()
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.allowedFileTypes(ANY_FILE))
.add(
attr("annotations_jar", LABEL)
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.allowedFileTypes(ANY_FILE))
.add(
attr("main_dex_classes", LABEL)
.mandatory()
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.allowedFileTypes(ANY_FILE))
.add(
attr("apkbuilder", LABEL)
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.allowedFileTypes(ANY_FILE)
.exec())
.add(
attr("apksigner", LABEL)
.mandatory()
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.allowedFileTypes(ANY_FILE)
.exec())
.add(
attr("zipalign", LABEL)
.mandatory()
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.allowedFileTypes(ANY_FILE)
.exec())
.add(
@@ -139,7 +139,7 @@
.mandatoryProviders(BootClassPathInfo.PROVIDER.id()))
.add(
attr("legacy_main_dex_list_generator", LABEL)
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.allowedFileTypes(ANY_FILE)
.exec())
.advertiseStarlarkProvider(
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/DexArchiveAspect.java b/src/main/java/com/google/devtools/build/lib/rules/android/DexArchiveAspect.java
index f38913c..3492026 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/DexArchiveAspect.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/DexArchiveAspect.java
@@ -166,7 +166,7 @@
// Parse labels since we don't have RuleDefinitionEnvironment.getLabel like in a rule
.add(
attr(ASPECT_DESUGAR_PREREQ, LABEL)
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.exec()
.value(
Label.parseCanonicalUnchecked(
@@ -187,7 +187,7 @@
// Marginally improves "query2" precision for targets that disable incremental dexing
result.add(
attr(ASPECT_DEXBUILDER_PREREQ, LABEL)
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.exec()
.value(
Label.parseCanonicalUnchecked(toolsRepository + "//tools/android:dexbuilder")));
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcHostToolchainAliasRule.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcHostToolchainAliasRule.java
index 8097512..759e884 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcHostToolchainAliasRule.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcHostToolchainAliasRule.java
@@ -45,7 +45,7 @@
.removeAttribute("distribs")
.add(
attr("$cc_toolchain_alias", LABEL)
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.value(env.getToolsLabel("//tools/cpp:current_cc_toolchain")))
.build();
}
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchainInputsTransitionFactory.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchainInputsTransitionFactory.java
index 599636b..4793c51 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchainInputsTransitionFactory.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchainInputsTransitionFactory.java
@@ -35,7 +35,7 @@
if (data.attributes().has(ATTR_NAME) && !data.attributes().get(ATTR_NAME, BOOLEAN)) {
return NoTransition.INSTANCE;
} else {
- return ExecutionTransitionFactory.create().create(data);
+ return ExecutionTransitionFactory.createFactory().create(data);
}
}
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchainRule.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchainRule.java
index e0cc92d..49d84c1 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchainRule.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchainRule.java
@@ -296,12 +296,12 @@
.add(attr(CcToolchainInputsTransitionFactory.ATTR_NAME, BOOLEAN).value(true))
.add(
attr("$interface_library_builder", LABEL)
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.singleArtifact()
.value(env.getToolsLabel("//tools/cpp:interface_library_builder")))
.add(
attr("$link_dynamic_library_tool", LABEL)
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.singleArtifact()
.value(env.getToolsLabel("//tools/cpp:link_dynamic_library")))
.add(
@@ -309,7 +309,7 @@
.value(CppRuleClasses.ccToolchainTypeAttribute(env)))
.add(
attr(":zipper", LABEL)
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.singleArtifact()
.value(
LabelLateBoundDefault.fromTargetConfiguration(
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppRuleClasses.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppRuleClasses.java
index f586c0f..89289d6 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppRuleClasses.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppRuleClasses.java
@@ -534,7 +534,7 @@
if (addGrepIncludes) {
builder.add(
attr("$grep_includes", LABEL)
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.value(env.getToolsLabel("//tools/cpp:grep-includes")));
}
return builder.build();
diff --git a/src/main/java/com/google/devtools/build/lib/rules/extra/ExtraActionRule.java b/src/main/java/com/google/devtools/build/lib/rules/extra/ExtraActionRule.java
index f693de5..31b1888 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/extra/ExtraActionRule.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/extra/ExtraActionRule.java
@@ -58,7 +58,7 @@
<!-- #END_BLAZE_RULE.ATTRIBUTE -->*/
.add(
attr("tools", LABEL_LIST)
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.allowedFileTypes()
.exec())
/*<!-- #BLAZE_RULE(extra_action).ATTRIBUTE(out_templates) -->
diff --git a/src/main/java/com/google/devtools/build/lib/rules/genrule/GenRuleBaseRule.java b/src/main/java/com/google/devtools/build/lib/rules/genrule/GenRuleBaseRule.java
index 07824cf..57bb199 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/genrule/GenRuleBaseRule.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/genrule/GenRuleBaseRule.java
@@ -82,7 +82,7 @@
<!-- #END_BLAZE_RULE.ATTRIBUTE --> */
.add(
attr("tools", LABEL_LIST)
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.allowedFileTypes(FileTypeSet.ANY_FILE))
/* <!-- #BLAZE_RULE(genrule).ATTRIBUTE(exec_tools) -->
@@ -96,7 +96,7 @@
<!-- #END_BLAZE_RULE.ATTRIBUTE --> */
.add(
attr("exec_tools", LABEL_LIST)
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.allowedFileTypes(FileTypeSet.ANY_FILE)
.dontCheckConstraints())
diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaPackageConfigurationRule.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaPackageConfigurationRule.java
index 7b9896f..9aebdd0 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaPackageConfigurationRule.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaPackageConfigurationRule.java
@@ -43,7 +43,7 @@
<!-- #END_BLAZE_RULE.ATTRIBUTE --> */
.add(
attr("packages", LABEL_LIST)
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.allowedFileTypes()
.mandatoryProviders(ImmutableList.of(PackageGroupConfiguredTarget.PROVIDER.id())))
/* <!-- #BLAZE_RULE(java_package_configuration).ATTRIBUTE(javacopts) -->
diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaPluginsFlagAliasRule.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaPluginsFlagAliasRule.java
index ddfcb3a..cfee6b8 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaPluginsFlagAliasRule.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaPluginsFlagAliasRule.java
@@ -46,7 +46,7 @@
return builder
.add(
attr(":java_plugins", LABEL_LIST)
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.mandatoryProviders(JavaPluginInfo.PROVIDER.id())
.silentRuleClassFilter()
.value(JavaSemantics.JAVA_PLUGINS))
diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaToolchainRule.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaToolchainRule.java
index 67962df..506165a 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaToolchainRule.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaToolchainRule.java
@@ -104,7 +104,7 @@
<!-- #END_BLAZE_RULE.ATTRIBUTE --> */
.add(
attr("javabuilder_data", LABEL_LIST)
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.allowedFileTypes(FileTypeSet.ANY_FILE))
/* <!-- #BLAZE_RULE(java_toolchain).ATTRIBUTE(turbine_jvm_opts) -->
The list of arguments for the JVM when invoking turbine.
@@ -115,7 +115,7 @@
<!-- #END_BLAZE_RULE.ATTRIBUTE --> */
.add(
attr("turbine_data", LABEL_LIST)
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.allowedFileTypes(FileTypeSet.ANY_FILE))
/* <!-- #BLAZE_RULE(java_toolchain).ATTRIBUTE(javac_supports_workers) -->
True if JavaBuilder supports running as a persistent worker, false if it doesn't.
@@ -135,7 +135,7 @@
.add(
attr("tools", LABEL_LIST)
// This needs to be in the execution configuration.
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.allowedFileTypes(FileTypeSet.ANY_FILE))
/* <!-- #BLAZE_RULE(java_toolchain).ATTRIBUTE(javabuilder) -->
Label of the JavaBuilder deploy jar.
@@ -144,7 +144,7 @@
attr("javabuilder", LABEL_LIST)
.mandatory()
// This needs to be in the execution configuration.
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.allowedFileTypes(FileTypeSet.ANY_FILE)
.exec())
/* <!-- #BLAZE_RULE(java_toolchain).ATTRIBUTE(singlejar) -->
@@ -154,7 +154,7 @@
attr("singlejar", LABEL_LIST)
.mandatory()
// This needs to be in the execution configuration.
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.allowedFileTypes(FileTypeSet.ANY_FILE)
.exec())
/* <!-- #BLAZE_RULE(java_toolchain).ATTRIBUTE(genclass) -->
@@ -165,7 +165,7 @@
.mandatory()
.singleArtifact()
// This needs to be in the execution configuration.
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.allowedFileTypes(FileTypeSet.ANY_FILE)
.exec())
/* <!-- #BLAZE_RULE(java_toolchain).ATTRIBUTE(deps_checker) -->
@@ -174,7 +174,7 @@
.add(
attr("deps_checker", LABEL_LIST)
.singleArtifact()
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.allowedFileTypes(FileTypeSet.ANY_FILE)
.exec())
/* <!-- #BLAZE_RULE(java_toolchain).ATTRIBUTE(resourcejar) -->
@@ -184,7 +184,7 @@
attr("resourcejar", LABEL_LIST)
.singleArtifact()
// This needs to be in the execution configuration.
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.allowedFileTypes(FileTypeSet.ANY_FILE)
.exec())
/* <!-- #BLAZE_RULE(java_toolchain).ATTRIBUTE(timezone_data) -->
@@ -195,7 +195,7 @@
attr("timezone_data", LABEL)
.singleArtifact()
// This needs to be in the execution configuration.
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.allowedFileTypes(FileTypeSet.ANY_FILE)
.exec())
/* <!-- #BLAZE_RULE(java_toolchain).ATTRIBUTE(ijar) -->
@@ -205,7 +205,7 @@
attr("ijar", LABEL_LIST)
.mandatory()
// This needs to be in the execution configuration.
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.allowedFileTypes(FileTypeSet.ANY_FILE)
.exec())
/* <!-- #BLAZE_RULE(java_toolchain).ATTRIBUTE(header_compiler) -->
@@ -215,7 +215,7 @@
attr("header_compiler", LABEL_LIST)
.singleArtifact()
// This needs to be in the execution configuration.
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.allowedFileTypes(FileTypeSet.ANY_FILE)
.exec())
/* <!-- #BLAZE_RULE(java_toolchain).ATTRIBUTE(header_compiler_direct) -->
@@ -227,7 +227,7 @@
.add(
attr("header_compiler_direct", LABEL_LIST)
// This needs to be in the execution configuration.
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.allowedFileTypes(FileTypeSet.ANY_FILE)
.exec())
.add(
@@ -244,7 +244,7 @@
.add(
attr("oneversion", LABEL)
// This needs to be in the execution configuration.
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.allowedFileTypes(FileTypeSet.ANY_FILE)
.exec())
/* <!-- #BLAZE_RULE(java_toolchain).ATTRIBUTE(oneversion_whitelist) -->
@@ -254,7 +254,7 @@
attr("oneversion_whitelist", LABEL)
.singleArtifact()
// This needs to be in the execution configuration.
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.allowedFileTypes(FileTypeSet.ANY_FILE)
.exec())
/* <!-- #BLAZE_RULE(java_toolchain).ATTRIBUTE(forcibly_disable_header_compilation) -->
@@ -273,23 +273,20 @@
attr("package_configuration", LABEL_LIST)
.allowedFileTypes()
// This needs to be in the execution configuration.
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.mandatoryBuiltinProviders(
ImmutableList.of(JavaPackageConfigurationProvider.class)))
/* <!-- #BLAZE_RULE(java_toolchain).ATTRIBUTE(jacocorunner) -->
Label of the JacocoCoverageRunner deploy jar.
<!-- #END_BLAZE_RULE.ATTRIBUTE --> */
- .add(
- attr("jacocorunner", LABEL)
- .allowedFileTypes(FileTypeSet.ANY_FILE)
- .exec())
+ .add(attr("jacocorunner", LABEL).allowedFileTypes(FileTypeSet.ANY_FILE).exec())
/* <!-- #BLAZE_RULE(java_toolchain).ATTRIBUTE(proguard_allowlister) -->
Label of the Proguard allowlister.
<!-- #END_BLAZE_RULE.ATTRIBUTE --> */
.add(
attr("proguard_allowlister", LABEL)
// This needs to be in the execution configuration.
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.allowedFileTypes(FileTypeSet.ANY_FILE)
// TODO(b/170769708): set explicitly in Bazel and remove this default
.value(env.getToolsLabel("//tools/jdk:proguard_whitelister"))
@@ -300,7 +297,7 @@
<!-- #END_BLAZE_RULE.ATTRIBUTE --> */
.add(
attr("java_runtime", LABEL)
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.mandatory()
.mandatoryProviders(JavaRuntimeInfo.PROVIDER.id())
.allowedFileTypes(FileTypeSet.NO_FILE)
@@ -310,7 +307,7 @@
<!-- #END_BLAZE_RULE.ATTRIBUTE --> */
.add(
attr("android_lint_runner", LABEL)
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.allowedFileTypes(FileTypeSet.ANY_FILE)
.exec())
/* <!-- #BLAZE_RULE(java_toolchain).ATTRIBUTE(android_lint_opts) -->
@@ -322,7 +319,7 @@
<!-- #END_BLAZE_RULE.ATTRIBUTE --> */
.add(
attr("android_lint_data", LABEL_LIST)
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.allowedFileTypes(FileTypeSet.ANY_FILE))
/* <!-- #BLAZE_RULE(java_toolchain).ATTRIBUTE(android_lint_jvm_opts) -->
The list of arguments for the JVM when invoking Android Lint.
@@ -334,19 +331,19 @@
.add(
attr("android_lint_package_configuration", LABEL_LIST)
.allowedFileTypes()
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.mandatoryBuiltinProviders(
ImmutableList.of(JavaPackageConfigurationProvider.class)))
.add(attr("jspecify_processor_class", STRING).value("").undocumented("experimental"))
.add(
attr("jspecify_processor", LABEL)
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.allowedFileTypes(FileTypeSet.ANY_FILE)
.exec()
.undocumented("experimental"))
.add(
attr("jspecify_implicit_deps", LABEL)
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.allowedFileTypes(FileTypeSet.ANY_FILE)
.exec()
.undocumented("experimental"))
@@ -356,23 +353,23 @@
.undocumented("experimental"))
.add(
attr("jspecify_stubs", LABEL_LIST)
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.allowedFileTypes(FileTypeSet.ANY_FILE)
.undocumented("experimental"))
.add(
attr("jspecify_packages", LABEL_LIST)
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.allowedFileTypes()
.mandatoryProviders(ImmutableList.of(PackageGroupConfiguredTarget.PROVIDER.id()))
.undocumented("experimental"))
.add(
attr(":bytecode_optimizer", LABEL)
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.value(JavaSemantics.BYTECODE_OPTIMIZER)
.exec())
.add(
attr(":local_java_optimization_configuration", LABEL_LIST)
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.value(JavaSemantics.LOCAL_JAVA_OPTIMIZATION_CONFIGURATION))
.build();
}
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/J2ObjcAspect.java b/src/main/java/com/google/devtools/build/lib/rules/objc/J2ObjcAspect.java
index ba111ba..6bb8b8b 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/J2ObjcAspect.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/J2ObjcAspect.java
@@ -154,19 +154,19 @@
.addToolchainTypes(CppRuleClasses.ccToolchainTypeRequirement(ccToolchainType))
.add(
attr("$grep_includes", LABEL)
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.value(
Label.parseCanonicalUnchecked(toolsRepository + "//tools/cpp:grep-includes")))
.add(
attr("$j2objc", LABEL)
- .cfg(ExecutionTransitionFactory.create("j2objc"))
+ .cfg(ExecutionTransitionFactory.createFactory("j2objc"))
.exec()
.value(
Label.parseCanonicalUnchecked(
toolsRepository + "//tools/j2objc:j2objc_deploy.jar")))
.add(
attr("$j2objc_wrapper", LABEL)
- .cfg(ExecutionTransitionFactory.create("j2objc"))
+ .cfg(ExecutionTransitionFactory.createFactory("j2objc"))
.exec()
.legacyAllowAnyFileType()
.value(
@@ -174,7 +174,7 @@
toolsRepository + "//tools/j2objc:j2objc_wrapper_binary")))
.add(
attr("$j2objc_header_map", LABEL)
- .cfg(ExecutionTransitionFactory.create("j2objc"))
+ .cfg(ExecutionTransitionFactory.createFactory("j2objc"))
.exec()
.legacyAllowAnyFileType()
.value(
@@ -182,19 +182,19 @@
toolsRepository + "//tools/j2objc:j2objc_header_map_binary")))
.add(
attr("$jre_emul_jar", LABEL)
- .cfg(ExecutionTransitionFactory.create("j2objc"))
+ .cfg(ExecutionTransitionFactory.createFactory("j2objc"))
.value(
Label.parseCanonicalUnchecked(
toolsRepository + "//third_party/java/j2objc:jre_emul.jar")))
.add(
attr("$jre_emul_module", LABEL)
- .cfg(ExecutionTransitionFactory.create("j2objc"))
+ .cfg(ExecutionTransitionFactory.createFactory("j2objc"))
.value(
Label.parseCanonicalUnchecked(
toolsRepository + "//third_party/java/j2objc:jre_emul_module")))
.add(
attr(":dead_code_report", LABEL)
- .cfg(ExecutionTransitionFactory.create("j2objc"))
+ .cfg(ExecutionTransitionFactory.createFactory("j2objc"))
.value(DEAD_CODE_REPORT))
.add(
attr("$jre_lib", LABEL)
@@ -203,7 +203,7 @@
toolsRepository + "//third_party/java/j2objc:jre_core_lib")))
.add(
attr("$xcrunwrapper", LABEL)
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.exec()
.value(
Label.parseCanonicalUnchecked(toolsRepository + "//tools/objc:xcrunwrapper")))
@@ -215,7 +215,7 @@
.value(AppleToolchain.getXcodeConfigLabel(toolsRepository)))
.add(
attr("$zipper", LABEL)
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.exec()
.value(Label.parseCanonicalUnchecked(toolsRepository + "//tools/zip:zipper")))
.add(
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcRuleClasses.java b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcRuleClasses.java
index 78d486c..e9c78f4 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcRuleClasses.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcRuleClasses.java
@@ -475,7 +475,7 @@
return builder
.add(
attr("$xcrunwrapper", LABEL)
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.exec()
.value(env.getToolsLabel("//tools/objc:xcrunwrapper")))
.build();
diff --git a/src/main/java/com/google/devtools/build/lib/rules/proto/ProtoLangToolchainRule.java b/src/main/java/com/google/devtools/build/lib/rules/proto/ProtoLangToolchainRule.java
index 3725a99..5b99bf2 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/proto/ProtoLangToolchainRule.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/proto/ProtoLangToolchainRule.java
@@ -70,7 +70,7 @@
.add(
attr("plugin", LABEL)
.exec()
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.allowedFileTypes())
/* <!-- #BLAZE_RULE(proto_lang_toolchain).ATTRIBUTE(runtime) -->
@@ -95,7 +95,7 @@
.add(
attr("proto_compiler", LABEL)
.allowedFileTypes()
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.exec())
.requiresConfigurationFragments(ProtoConfiguration.class)
.removeAttribute("data")
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/AspectTest.java b/src/test/java/com/google/devtools/build/lib/analysis/AspectTest.java
index 3fb0afe..7c22004 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/AspectTest.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/AspectTest.java
@@ -516,7 +516,7 @@
.aspect(AspectThatRegistersAction.INSTANCE))
.add(
attr(":action_listener", LABEL_LIST)
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.value(ACTION_LISTENER)));
public static class AspectThatRegistersAction extends NativeAspectClass
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/config/ExecutionTransitionFactoryTest.java b/src/test/java/com/google/devtools/build/lib/analysis/config/ExecutionTransitionFactoryTest.java
index 4b8e3da..d0a0c0e 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/config/ExecutionTransitionFactoryTest.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/config/ExecutionTransitionFactoryTest.java
@@ -35,13 +35,13 @@
@Test
public void executionTransition() throws OptionsParsingException, InterruptedException {
- ExecutionTransitionFactory execTransitionFactory = ExecutionTransitionFactory.create();
PatchTransition transition =
- execTransitionFactory.create(
- AttributeTransitionData.builder()
- .attributes(FakeAttributeMapper.empty())
- .executionPlatform(EXECUTION_PLATFORM)
- .build());
+ ExecutionTransitionFactory.createFactory()
+ .create(
+ AttributeTransitionData.builder()
+ .attributes(FakeAttributeMapper.empty())
+ .executionPlatform(EXECUTION_PLATFORM)
+ .build());
assertThat(transition).isNotNull();
@@ -67,14 +67,14 @@
@Test
public void executionTransition_noExecPlatform()
throws OptionsParsingException, InterruptedException {
- ExecutionTransitionFactory execTransitionFactory = ExecutionTransitionFactory.create();
// No execution platform available.
PatchTransition transition =
- execTransitionFactory.create(
- AttributeTransitionData.builder()
- .attributes(FakeAttributeMapper.empty())
- .executionPlatform(null)
- .build());
+ ExecutionTransitionFactory.createFactory()
+ .create(
+ AttributeTransitionData.builder()
+ .attributes(FakeAttributeMapper.empty())
+ .executionPlatform(null)
+ .build());
assertThat(transition).isNotNull();
@@ -95,13 +95,13 @@
@Test
public void executionTransition_confDist_legacy()
throws OptionsParsingException, InterruptedException {
- ExecutionTransitionFactory execTransitionFactory = ExecutionTransitionFactory.create();
PatchTransition transition =
- execTransitionFactory.create(
- AttributeTransitionData.builder()
- .attributes(FakeAttributeMapper.empty())
- .executionPlatform(EXECUTION_PLATFORM)
- .build());
+ ExecutionTransitionFactory.createFactory()
+ .create(
+ AttributeTransitionData.builder()
+ .attributes(FakeAttributeMapper.empty())
+ .executionPlatform(EXECUTION_PLATFORM)
+ .build());
assertThat(transition).isNotNull();
@@ -125,13 +125,13 @@
@Test
public void executionTransition_confDist_fullHash()
throws OptionsParsingException, InterruptedException {
- ExecutionTransitionFactory execTransitionFactory = ExecutionTransitionFactory.create();
PatchTransition transition =
- execTransitionFactory.create(
- AttributeTransitionData.builder()
- .attributes(FakeAttributeMapper.empty())
- .executionPlatform(EXECUTION_PLATFORM)
- .build());
+ ExecutionTransitionFactory.createFactory()
+ .create(
+ AttributeTransitionData.builder()
+ .attributes(FakeAttributeMapper.empty())
+ .executionPlatform(EXECUTION_PLATFORM)
+ .build());
assertThat(transition).isNotNull();
@@ -159,13 +159,13 @@
@Test
public void executionTransition_confDist_diffToAffected()
throws OptionsParsingException, InterruptedException {
- ExecutionTransitionFactory execTransitionFactory = ExecutionTransitionFactory.create();
PatchTransition transition =
- execTransitionFactory.create(
- AttributeTransitionData.builder()
- .attributes(FakeAttributeMapper.empty())
- .executionPlatform(EXECUTION_PLATFORM)
- .build());
+ ExecutionTransitionFactory.createFactory()
+ .create(
+ AttributeTransitionData.builder()
+ .attributes(FakeAttributeMapper.empty())
+ .executionPlatform(EXECUTION_PLATFORM)
+ .build());
assertThat(transition).isNotNull();
@@ -188,13 +188,13 @@
@Test
public void executionTransition_confDist_off()
throws OptionsParsingException, InterruptedException {
- ExecutionTransitionFactory execTransitionFactory = ExecutionTransitionFactory.create();
PatchTransition transition =
- execTransitionFactory.create(
- AttributeTransitionData.builder()
- .attributes(FakeAttributeMapper.empty())
- .executionPlatform(EXECUTION_PLATFORM)
- .build());
+ ExecutionTransitionFactory.createFactory()
+ .create(
+ AttributeTransitionData.builder()
+ .attributes(FakeAttributeMapper.empty())
+ .executionPlatform(EXECUTION_PLATFORM)
+ .build());
assertThat(transition).isNotNull();
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/test/TestTrimmingTransitionTest.java b/src/test/java/com/google/devtools/build/lib/analysis/test/TestTrimmingTransitionTest.java
index 462df43..917f46d 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/test/TestTrimmingTransitionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/test/TestTrimmingTransitionTest.java
@@ -101,7 +101,7 @@
Label executionPlatform = Label.parseCanonicalUnchecked("//platform:exec");
PatchTransition execTransition =
- ExecutionTransitionFactory.create()
+ ExecutionTransitionFactory.createFactory()
.create(
AttributeTransitionData.builder()
.attributes(FakeAttributeMapper.empty())
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/test/TrimTestConfigurationTest.java b/src/test/java/com/google/devtools/build/lib/analysis/test/TrimTestConfigurationTest.java
index f491ebd..da71995 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/test/TrimTestConfigurationTest.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/test/TrimTestConfigurationTest.java
@@ -89,7 +89,7 @@
"native_test",
attr("deps", LABEL_LIST).allowedFileTypes(),
attr("exec_deps", LABEL_LIST)
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.allowedFileTypes());
private static final RuleDefinition NATIVE_LIB_RULE =
@@ -100,7 +100,7 @@
"native_lib",
attr("deps", LABEL_LIST).allowedFileTypes(),
attr("exec_deps", LABEL_LIST)
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.allowedFileTypes());
@Before
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestUtil.java b/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestUtil.java
index 9c5685e..b3ec3f7 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestUtil.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestUtil.java
@@ -551,7 +551,7 @@
public static BuildOptions execOptions(BuildOptions targetOptions, EventHandler handler)
throws InterruptedException {
return Iterables.getOnlyElement(
- ExecutionTransitionFactory.create()
+ ExecutionTransitionFactory.createFactory()
.create(
AttributeTransitionData.builder()
.attributes(FakeAttributeMapper.empty())
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/util/MockRuleDefaults.java b/src/test/java/com/google/devtools/build/lib/analysis/util/MockRuleDefaults.java
index 65e4827..4aa1071 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/util/MockRuleDefaults.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/util/MockRuleDefaults.java
@@ -64,7 +64,7 @@
attr("tags", STRING_LIST).nonconfigurable("test"),
attr("visibility", NODEP_LABEL_LIST)
.orderIndependent()
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.nonconfigurable("test"),
attr(RuleClass.COMPATIBLE_ENVIRONMENT_ATTR, LABEL_LIST)
.allowedFileTypes(FileTypeSet.NO_FILE)
diff --git a/src/test/java/com/google/devtools/build/lib/buildtool/util/BlazeRuntimeWrapper.java b/src/test/java/com/google/devtools/build/lib/buildtool/util/BlazeRuntimeWrapper.java
index 41d8905..ed9376c 100644
--- a/src/test/java/com/google/devtools/build/lib/buildtool/util/BlazeRuntimeWrapper.java
+++ b/src/test/java/com/google/devtools/build/lib/buildtool/util/BlazeRuntimeWrapper.java
@@ -414,7 +414,7 @@
BuildOptions targetOptions = targetConfig.getOptions();
BuildOptions execOptions =
Iterables.getOnlyElement(
- ExecutionTransitionFactory.create()
+ ExecutionTransitionFactory.createFactory()
.create(
AttributeTransitionData.builder()
.attributes(FakeAttributeMapper.empty())
diff --git a/src/test/java/com/google/devtools/build/lib/packages/AttributeTest.java b/src/test/java/com/google/devtools/build/lib/packages/AttributeTest.java
index c7622f8..7efcc0b 100644
--- a/src/test/java/com/google/devtools/build/lib/packages/AttributeTest.java
+++ b/src/test/java/com/google/devtools/build/lib/packages/AttributeTest.java
@@ -103,12 +103,12 @@
Attribute.Builder<String> builder =
attr("x", STRING)
.mandatory()
- .cfg(ExecutionTransitionFactory.create())
+ .cfg(ExecutionTransitionFactory.createFactory())
.undocumented("")
.value("y");
assertThrows(IllegalStateException.class, builder::mandatory);
assertThrows(
- IllegalStateException.class, () -> builder.cfg(ExecutionTransitionFactory.create()));
+ IllegalStateException.class, () -> builder.cfg(ExecutionTransitionFactory.createFactory()));
assertThrows(IllegalStateException.class, () -> builder.undocumented(""));
assertThrows(IllegalStateException.class, () -> builder.value("z"));
@@ -277,7 +277,10 @@
@Test
public void testExecTransition() {
Attribute attr =
- attr("foo", LABEL).cfg(ExecutionTransitionFactory.create()).allowedFileTypes().build();
+ attr("foo", LABEL)
+ .cfg(ExecutionTransitionFactory.createFactory())
+ .allowedFileTypes()
+ .build();
assertThat(attr.getTransitionFactory().isTool()).isTrue();
assertThat(attr.getTransitionFactory().isSplit()).isFalse();
}
diff --git a/src/test/java/com/google/devtools/build/lib/query2/cquery/ConfiguredTargetQuerySemanticsTest.java b/src/test/java/com/google/devtools/build/lib/query2/cquery/ConfiguredTargetQuerySemanticsTest.java
index eba8fd4..1a2534d 100644
--- a/src/test/java/com/google/devtools/build/lib/query2/cquery/ConfiguredTargetQuerySemanticsTest.java
+++ b/src/test/java/com/google/devtools/build/lib/query2/cquery/ConfiguredTargetQuerySemanticsTest.java
@@ -207,7 +207,7 @@
"rule_with_exec_dep",
attr("exec_dep", LABEL)
.allowedFileTypes(FileTypeSet.ANY_FILE)
- .cfg(ExecutionTransitionFactory.create()),
+ .cfg(ExecutionTransitionFactory.createFactory()),
attr("$impl_dep", LABEL)
.allowedFileTypes(FileTypeSet.ANY_FILE)
.value(Label.parseCanonicalUnchecked("//test:other")));
@@ -265,7 +265,7 @@
attr("target", LABEL).allowedFileTypes(FileTypeSet.ANY_FILE),
attr("exec", LABEL)
.allowedFileTypes(FileTypeSet.ANY_FILE)
- .cfg(ExecutionTransitionFactory.create()),
+ .cfg(ExecutionTransitionFactory.createFactory()),
attr("deps", BuildType.LABEL_LIST).allowedFileTypes(FileTypeSet.ANY_FILE));
MockRule simpleRule =
() ->
diff --git a/src/test/java/com/google/devtools/build/lib/query2/cquery/ProtoOutputFormatterCallbackTest.java b/src/test/java/com/google/devtools/build/lib/query2/cquery/ProtoOutputFormatterCallbackTest.java
index 40a0910..8b8cf65 100644
--- a/src/test/java/com/google/devtools/build/lib/query2/cquery/ProtoOutputFormatterCallbackTest.java
+++ b/src/test/java/com/google/devtools/build/lib/query2/cquery/ProtoOutputFormatterCallbackTest.java
@@ -135,7 +135,7 @@
builder.add(
attr("deps", LABEL_LIST)
.allowedFileTypes(FileTypeSet.ANY_FILE)
- .cfg(ExecutionTransitionFactory.create())));
+ .cfg(ExecutionTransitionFactory.createFactory())));
MockRule parentRuleClass =
() ->
MockRule.define(
