diff options
| author |  nharmata <nharmata@google.com> | 2017-12-05 09:27:45 -0800 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2017-12-05 09:29:47 -0800 |
| commit | e4eb23fe5512760b0e4a80c19a98f43875051fb1 (patch) | |
| tree | 65bf81551ea6410918c8a88af7ac4cb466b7437a /src/main/java/com/google/devtools/build/lib/skyframe/SequencedSkyframeExecutor.java | |
| parent | 97facf3aee6332cdb5b6cf51f700f3efe1e6bf45 (diff) | |
Automated rollback of commit d0f06a6e4b61adc39bf5e1cfbae39501a89dc8e3.
RELNOTES: None
PiperOrigin-RevId: 177965330
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, 8 insertions, 4 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 4e68fb7818..f3e4bf4da0 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 @@ -140,7 +140,8 @@ public final class SequencedSkyframeExecutor extends SkyframeExecutor { Iterable<? extends DiffAwareness.Factory> diffAwarenessFactories, ImmutableMap<SkyFunctionName, SkyFunction> extraSkyFunctions, Iterable<SkyValueDirtinessChecker> customDirtinessCheckers, - PathFragment blacklistedPackagePrefixesFile, + ImmutableSet<PathFragment> hardcodedBlacklistedPackagePrefixes, + PathFragment additionalBlacklistedPackagePrefixesFile, CrossRepositoryLabelViolationStrategy crossRepositoryLabelViolationStrategy, List<BuildFileName> buildFilesByPriority, ActionOnIOExceptionReadingBuildFile actionOnIOExceptionReadingBuildFile) { @@ -154,7 +155,8 @@ public final class SequencedSkyframeExecutor extends SkyframeExecutor { buildInfoFactories, extraSkyFunctions, ExternalFileAction.DEPEND_ON_EXTERNAL_PKG_FOR_EXTERNAL_REPO_PATHS, - blacklistedPackagePrefixesFile, + hardcodedBlacklistedPackagePrefixes, + additionalBlacklistedPackagePrefixesFile, crossRepositoryLabelViolationStrategy, buildFilesByPriority, actionOnIOExceptionReadingBuildFile); @@ -172,7 +174,8 @@ public final class SequencedSkyframeExecutor extends SkyframeExecutor { Iterable<? extends DiffAwareness.Factory> diffAwarenessFactories, ImmutableMap<SkyFunctionName, SkyFunction> extraSkyFunctions, Iterable<SkyValueDirtinessChecker> customDirtinessCheckers, - PathFragment blacklistedPackagePrefixesFile, + ImmutableSet<PathFragment> hardcodedBlacklistedPackagePrefixes, + PathFragment additionalBlacklistedPackagePrefixesFile, CrossRepositoryLabelViolationStrategy crossRepositoryLabelViolationStrategy, List<BuildFileName> buildFilesByPriority, ActionOnIOExceptionReadingBuildFile actionOnIOExceptionReadingBuildFile) { @@ -188,7 +191,8 @@ public final class SequencedSkyframeExecutor extends SkyframeExecutor { diffAwarenessFactories, extraSkyFunctions, customDirtinessCheckers, - blacklistedPackagePrefixesFile, + hardcodedBlacklistedPackagePrefixes, + additionalBlacklistedPackagePrefixesFile, crossRepositoryLabelViolationStrategy, buildFilesByPriority, actionOnIOExceptionReadingBuildFile); |