diff options
| author |  nharmata <nharmata@google.com> | 2017-11-28 09:58:02 -0800 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2017-11-28 10:00:10 -0800 |
| commit | d0f06a6e4b61adc39bf5e1cfbae39501a89dc8e3 (patch) | |
| tree | 54d92cd2766eef00cb06a8bf6572426385fedb71 /src/main/java/com/google/devtools/build/lib/skyframe/PrecomputedValue.java | |
| parent | 5c7fc5b114b88e4737bf47ac6085789a190f0d45 (diff) | |
Automated rollback of commit b64119807b014d9f3b99fb8a02e22daf1a8299b6.
*** Reason for rollback ***
Tickles the shell integration test version of b/35042288
*** Original change description ***
Change BlacklistedPackagesPrefixesFunction to take a pair of a hardcoded set of directories and a file path containing more directories to blacklist. The current usage of PrecomputedValue#BLACKLISTED_PACKAGE_PREFIXES_FILE is overly general and is only meaningfully used by unit tests; in practice, the blacklist file path can never change over the lifetime of the Bazel server. Perform a minor simplifying refactor as a result of this.
RELNOTES: None.
PiperOrigin-RevId: 177176068
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/skyframe/PrecomputedValue.java')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/skyframe/PrecomputedValue.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/PrecomputedValue.java b/src/main/java/com/google/devtools/build/lib/skyframe/PrecomputedValue.java index 8f5277a98a..0d21adc540 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/PrecomputedValue.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/PrecomputedValue.java @@ -26,6 +26,7 @@ import com.google.devtools.build.lib.packages.RuleVisibility; import com.google.devtools.build.lib.pkgcache.PathPackageLocator; import com.google.devtools.build.lib.skyframe.SkyframeActionExecutor.ConflictException; import com.google.devtools.build.lib.syntax.SkylarkSemantics; +import com.google.devtools.build.lib.vfs.PathFragment; import com.google.devtools.build.skyframe.Injectable; import com.google.devtools.build.skyframe.LegacySkyKey; import com.google.devtools.build.skyframe.SkyFunction; @@ -77,6 +78,10 @@ public final class PrecomputedValue implements SkyValue { public static final Precomputed<String> DEFAULTS_PACKAGE_CONTENTS = new Precomputed<>(LegacySkyKey.create(SkyFunctions.PRECOMPUTED, "default_pkg")); + public static final Precomputed<PathFragment> BLACKLISTED_PACKAGE_PREFIXES_FILE = + new Precomputed<>( + LegacySkyKey.create(SkyFunctions.PRECOMPUTED, "blacklisted_package_prefixes_file")); + public static final Precomputed<RuleVisibility> DEFAULT_VISIBILITY = new Precomputed<>(LegacySkyKey.create(SkyFunctions.PRECOMPUTED, "default_visibility")); |