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/SequencedSkyframeExecutor.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/SequencedSkyframeExecutor.java')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/skyframe/SequencedSkyframeExecutor.java | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/SequencedSkyframeExecutor.java b/src/main/java/com/google/devtools/build/lib/skyframe/SequencedSkyframeExecutor.java index 8f8a0c8144..5dac255451 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/SequencedSkyframeExecutor.java +++ b/src/main/java/com/google/devtools/build/lib/skyframe/SequencedSkyframeExecutor.java @@ -139,8 +139,7 @@ public final class SequencedSkyframeExecutor extends SkyframeExecutor { Predicate<PathFragment> allowedMissingInputs, ImmutableMap<SkyFunctionName, SkyFunction> extraSkyFunctions, Iterable<SkyValueDirtinessChecker> customDirtinessCheckers, - ImmutableSet<PathFragment> hardcodedBlacklistedPackagePrefixes, - PathFragment additionalBlacklistedPackagePrefixesFile, + PathFragment blacklistedPackagePrefixesFile, CrossRepositoryLabelViolationStrategy crossRepositoryLabelViolationStrategy, List<BuildFileName> buildFilesByPriority, ActionOnIOExceptionReadingBuildFile actionOnIOExceptionReadingBuildFile) { @@ -154,8 +153,7 @@ public final class SequencedSkyframeExecutor extends SkyframeExecutor { allowedMissingInputs, extraSkyFunctions, ExternalFileAction.DEPEND_ON_EXTERNAL_PKG_FOR_EXTERNAL_REPO_PATHS, - hardcodedBlacklistedPackagePrefixes, - additionalBlacklistedPackagePrefixesFile, + blacklistedPackagePrefixesFile, crossRepositoryLabelViolationStrategy, buildFilesByPriority, actionOnIOExceptionReadingBuildFile); @@ -173,8 +171,7 @@ public final class SequencedSkyframeExecutor extends SkyframeExecutor { Predicate<PathFragment> allowedMissingInputs, ImmutableMap<SkyFunctionName, SkyFunction> extraSkyFunctions, Iterable<SkyValueDirtinessChecker> customDirtinessCheckers, - ImmutableSet<PathFragment> hardcodedBlacklistedPackagePrefixes, - PathFragment additionalBlacklistedPackagePrefixesFile, + PathFragment blacklistedPackagePrefixesFile, CrossRepositoryLabelViolationStrategy crossRepositoryLabelViolationStrategy, List<BuildFileName> buildFilesByPriority, ActionOnIOExceptionReadingBuildFile actionOnIOExceptionReadingBuildFile) { @@ -190,8 +187,7 @@ public final class SequencedSkyframeExecutor extends SkyframeExecutor { allowedMissingInputs, extraSkyFunctions, customDirtinessCheckers, - hardcodedBlacklistedPackagePrefixes, - additionalBlacklistedPackagePrefixesFile, + blacklistedPackagePrefixesFile, crossRepositoryLabelViolationStrategy, buildFilesByPriority, actionOnIOExceptionReadingBuildFile); |