diff options
author | nharmata <nharmata@google.com> | 2017-11-28 08:25:33 -0800 |
---|---|---|
committer | Copybara-Service <copybara-piper@google.com> | 2017-11-28 08:26:51 -0800 |
commit | b64119807b014d9f3b99fb8a02e22daf1a8299b6 (patch) | |
tree | 1d0300023d6786aa6b8e7a294db34b54962b56d8 /src/main/java/com/google/devtools/build/lib/skyframe/PrecomputedValue.java | |
parent | c478aea4c872b7ce3395746fd86168376f909284 (diff) |
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: 177164057
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, 0 insertions, 5 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 0d21adc540..8f5277a98a 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,7 +26,6 @@ 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; @@ -78,10 +77,6 @@ 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")); |