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/BazelSkyframeExecutorConstants.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/BazelSkyframeExecutorConstants.java')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/skyframe/BazelSkyframeExecutorConstants.java | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/BazelSkyframeExecutorConstants.java b/src/main/java/com/google/devtools/build/lib/skyframe/BazelSkyframeExecutorConstants.java index 5d4d272eb9..6b892a8319 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/BazelSkyframeExecutorConstants.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/BazelSkyframeExecutorConstants.java @@ -14,23 +14,15 @@ package com.google.devtools.build.lib.skyframe; import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableSet; import com.google.devtools.build.lib.skyframe.PackageFunction.ActionOnIOExceptionReadingBuildFile; import com.google.devtools.build.lib.skyframe.PackageLookupFunction.CrossRepositoryLabelViolationStrategy; import com.google.devtools.build.lib.skyframe.PackageLookupValue.BuildFileName; -import com.google.devtools.build.lib.vfs.PathFragment; /** Hardcoded constants describing bazel-on-skyframe behavior. */ public class BazelSkyframeExecutorConstants { private BazelSkyframeExecutorConstants() { } - public static final ImmutableSet<PathFragment> HARDCODED_BLACKLISTED_PACKAGE_PREFIXES = - ImmutableSet.of(); - - public static final PathFragment ADDITIONAL_BLACKLISTED_PACKAGE_PREFIXES_FILE = - PathFragment.EMPTY_FRAGMENT; - public static final CrossRepositoryLabelViolationStrategy CROSS_REPOSITORY_LABEL_VIOLATION_STRATEGY = CrossRepositoryLabelViolationStrategy.ERROR; |