Rename tools/default pacakge flag to incompatible_disable_tools_defaults_package from experimental_enable_tools_defaults_package RELNOTES:none PiperOrigin-RevId: 210685764
diff --git a/src/main/java/com/google/devtools/build/lib/pkgcache/PackageCacheOptions.java b/src/main/java/com/google/devtools/build/lib/pkgcache/PackageCacheOptions.java index dc4aa71..f4d17da 100644 --- a/src/main/java/com/google/devtools/build/lib/pkgcache/PackageCacheOptions.java +++ b/src/main/java/com/google/devtools/build/lib/pkgcache/PackageCacheOptions.java
@@ -14,6 +14,7 @@ package com.google.devtools.build.lib.pkgcache; + import com.google.common.base.Splitter; import com.google.common.base.Strings; import com.google.common.collect.ImmutableList; @@ -152,15 +153,19 @@ public boolean checkOutputFiles; @Option( - name = "experimental_enable_tools_defaults_package", - defaultValue = "true", + name = "incompatible_disable_tools_defaults_package", + defaultValue = "false", documentationCategory = OptionDocumentationCategory.UNDOCUMENTED, - effectTags = {OptionEffectTag.AFFECTS_OUTPUTS}, - metadataTags = {OptionMetadataTag.EXPERIMENTAL}, + effectTags = {OptionEffectTag.AFFECTS_OUTPUTS, OptionEffectTag.LOADING_AND_ANALYSIS}, + metadataTags = { + OptionMetadataTag.EXPERIMENTAL, + OptionMetadataTag.TRIGGERED_BY_ALL_INCOMPATIBLE_CHANGES, + OptionMetadataTag.INCOMPATIBLE_CHANGE + }, help = - "If true, Blaze constructs an in-memory //tools/defaults package based on the command" - + " line options. If false, //tools/defaults is resolved as a regular package.") - public boolean experimentalInMemoryToolsDefaultsPackage; + "If false, Blaze constructs an in-memory //tools/defaults package based on the command" + + " line options. If true, //tools/defaults is resolved as a regular package.") + public boolean incompatibleDisableInMemoryToolsDefaultsPackage; /** * A converter from strings containing comma-separated names of packages to lists of strings.
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java index 9efd99a..4f2f8bb 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java
@@ -1162,12 +1162,12 @@ setShowLoadingProgress(packageCacheOptions.showLoadingProgress); setDefaultVisibility(packageCacheOptions.defaultVisibility); setSkylarkSemantics(skylarkSemanticsOptions.toSkylarkSemantics()); - if (packageCacheOptions.experimentalInMemoryToolsDefaultsPackage) { + if (packageCacheOptions.incompatibleDisableInMemoryToolsDefaultsPackage) { + setupDefaultPackage("# //tools/defaults in-memory package is disabled."); + PrecomputedValue.ENABLE_DEFAULTS_PACKAGE.set(injectable(), false); + } else { setupDefaultPackage(defaultsPackageContents); PrecomputedValue.ENABLE_DEFAULTS_PACKAGE.set(injectable(), true); - } else { - setupDefaultPackage("# //tools/defaults in-memory package is not enabled."); - PrecomputedValue.ENABLE_DEFAULTS_PACKAGE.set(injectable(), false); } setPackageLocator(pkgLocator);