Remove the unused BlacklistedPackagePrefixesFunction#hardcodedBlacklistedPackagePrefixes.
RELNOTES: None
PiperOrigin-RevId: 288756249
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 5e7e689..8353f5f 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
@@ -19,6 +19,7 @@
import com.google.devtools.build.lib.skyframe.PackageFunction.ActionOnIOExceptionReadingBuildFile;
import com.google.devtools.build.lib.skyframe.PackageLookupFunction.CrossRepositoryLabelViolationStrategy;
import com.google.devtools.build.lib.vfs.PathFragment;
+import com.google.devtools.build.skyframe.SkyFunction;
/** Hardcoded constants describing bazel-on-skyframe behavior. */
public class BazelSkyframeExecutorConstants {
@@ -31,16 +32,15 @@
/**
* The file .bazelignore can be used to specify directories to be ignored by bazel
*
- * <p>This is intended for directories containing non-bazel sources (either generated,
- * or versioned sources built by other tools) that happen to contain a file called BUILD.</p>
+ * <p>This is intended for directories containing non-bazel sources (either generated, or
+ * versioned sources built by other tools) that happen to contain a file called BUILD.
*
- * <p>For the time being, this ignore functionality is limited by the fact that it is
- * applied only after pattern expansion. So if a pattern expansion fails (e.g., due to
- * symlink-cycles) and therefore fails the build, this ignore functionality currently
- * has no chance to kick in.</p>
+ * <p>For the time being, this ignore functionality is limited by the fact that it is applied only
+ * after pattern expansion. So if a pattern expansion fails (e.g., due to symlink-cycles) and
+ * therefore fails the build, this ignore functionality currently has no chance to kick in.
*/
- public static final PathFragment ADDITIONAL_BLACKLISTED_PACKAGE_PREFIXES_FILE =
- PathFragment.create(".bazelignore");
+ public static final SkyFunction BLACKLISTED_PACKAGE_PREFIXES_FUNCTION =
+ new BlacklistedPackagePrefixesFunction(PathFragment.create(".bazelignore"));
public static final CrossRepositoryLabelViolationStrategy
CROSS_REPOSITORY_LABEL_VIOLATION_STRATEGY = CrossRepositoryLabelViolationStrategy.ERROR;
@@ -54,8 +54,7 @@
public static SequencedSkyframeExecutor.Builder newBazelSkyframeExecutorBuilder() {
return SequencedSkyframeExecutor.builder()
- .setHardcodedBlacklistedPackagePrefixes(HARDCODED_BLACKLISTED_PACKAGE_PREFIXES)
- .setAdditionalBlacklistedPackagePrefixesFile(ADDITIONAL_BLACKLISTED_PACKAGE_PREFIXES_FILE)
+ .setBlacklistedPackagePrefixesFunction(BLACKLISTED_PACKAGE_PREFIXES_FUNCTION)
.setActionOnIOExceptionReadingBuildFile(ACTION_ON_IO_EXCEPTION_READING_BUILD_FILE)
.setCrossRepositoryLabelViolationStrategy(CROSS_REPOSITORY_LABEL_VIOLATION_STRATEGY)
.setBuildFilesByPriority(BUILD_FILES_BY_PRIORITY);
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/BlacklistedPackagePrefixesFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/BlacklistedPackagePrefixesFunction.java
index e2cb7ed..9734041 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/BlacklistedPackagePrefixesFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/BlacklistedPackagePrefixesFunction.java
@@ -34,21 +34,18 @@
import javax.annotation.Nullable;
/**
- * A function that returns the union of a set of hardcoded blacklisted package prefixes and the
- * contents of a hardcoded filepath whose contents is a blacklisted package prefix on each line.
+ * A {@link SkyFunction} for {@link BlacklistedPackagePrefixesValue}.
+ *
+ * <p>It is used to implement the `.bazelignore` feature.
*/
public class BlacklistedPackagePrefixesFunction implements SkyFunction {
- private ImmutableSet<PathFragment> hardcodedBlacklistedPackagePrefixes;
- private PathFragment additionalBlacklistedPackagePrefixesFile;
+ private final PathFragment blacklistedPackagePrefixesFile;
- public BlacklistedPackagePrefixesFunction(
- ImmutableSet<PathFragment> hardcodedBlacklistedPackagePrefixes,
- PathFragment additionalBlacklistedPackagePrefixesFile) {
- this.hardcodedBlacklistedPackagePrefixes = hardcodedBlacklistedPackagePrefixes;
- this.additionalBlacklistedPackagePrefixesFile = additionalBlacklistedPackagePrefixesFile;
+ public BlacklistedPackagePrefixesFunction(PathFragment blacklistedPackagePrefixesFile) {
+ this.blacklistedPackagePrefixesFile = blacklistedPackagePrefixesFile;
}
- private static void getBlacklistedPackagePrefixes(
+ public static void getBlacklistedPackagePrefixes(
RootedPath patternFile, ImmutableSet.Builder<PathFragment> blacklistedPackagePrefixesBuilder)
throws BlacklistedPatternsFunctionException {
try (InputStreamReader reader =
@@ -73,10 +70,7 @@
RepositoryName repositoryName = (RepositoryName) key.argument();
ImmutableSet.Builder<PathFragment> blacklistedPackagePrefixesBuilder = ImmutableSet.builder();
-
- blacklistedPackagePrefixesBuilder.addAll(hardcodedBlacklistedPackagePrefixes);
-
- if (!additionalBlacklistedPackagePrefixesFile.equals(PathFragment.EMPTY_FRAGMENT)) {
+ if (!blacklistedPackagePrefixesFile.equals(PathFragment.EMPTY_FRAGMENT)) {
PathPackageLocator pkgLocator = PrecomputedValue.PATH_PACKAGE_LOCATOR.get(env);
if (env.valuesMissing()) {
return null;
@@ -85,7 +79,7 @@
if (repositoryName.isMain()) {
for (Root packagePathEntry : pkgLocator.getPathEntries()) {
RootedPath rootedPatternFile =
- RootedPath.toRootedPath(packagePathEntry, additionalBlacklistedPackagePrefixesFile);
+ RootedPath.toRootedPath(packagePathEntry, blacklistedPackagePrefixesFile);
FileValue patternFileValue = (FileValue) env.getValue(FileValue.key(rootedPatternFile));
if (patternFileValue == null) {
return null;
@@ -105,8 +99,7 @@
if (repositoryValue.repositoryExists()) {
RootedPath rootedPatternFile =
RootedPath.toRootedPath(
- Root.fromPath(repositoryValue.getPath()),
- additionalBlacklistedPackagePrefixesFile);
+ Root.fromPath(repositoryValue.getPath()), blacklistedPackagePrefixesFile);
FileValue patternFileValue = (FileValue) env.getValue(FileValue.key(rootedPatternFile));
if (patternFileValue == null) {
return null;
@@ -118,7 +111,7 @@
}
}
- return new BlacklistedPackagePrefixesValue(blacklistedPackagePrefixesBuilder.build());
+ return BlacklistedPackagePrefixesValue.of(blacklistedPackagePrefixesBuilder.build());
}
private static final class PathFragmentLineProcessor
@@ -126,7 +119,7 @@
private final ImmutableSet.Builder<PathFragment> fragments = ImmutableSet.builder();
@Override
- public boolean processLine(String line) throws IOException {
+ public boolean processLine(String line) {
if (!line.isEmpty() && !line.startsWith("#")) {
fragments.add(PathFragment.create(line));
}
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/BlacklistedPackagePrefixesValue.java b/src/main/java/com/google/devtools/build/lib/skyframe/BlacklistedPackagePrefixesValue.java
index cae91cc..0426f36 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/BlacklistedPackagePrefixesValue.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/BlacklistedPackagePrefixesValue.java
@@ -30,10 +30,19 @@
public class BlacklistedPackagePrefixesValue implements SkyValue {
private final ImmutableSet<PathFragment> patterns;
- public BlacklistedPackagePrefixesValue(ImmutableSet<PathFragment> patterns) {
+ @AutoCodec @AutoCodec.VisibleForSerialization
+ public static final BlacklistedPackagePrefixesValue NO_BLACKLIST =
+ new BlacklistedPackagePrefixesValue(ImmutableSet.of());
+
+ private BlacklistedPackagePrefixesValue(ImmutableSet<PathFragment> patterns) {
this.patterns = Preconditions.checkNotNull(patterns);
}
+ @AutoCodec.Instantiator
+ public static BlacklistedPackagePrefixesValue of(ImmutableSet<PathFragment> patterns) {
+ return patterns.isEmpty() ? NO_BLACKLIST : new BlacklistedPackagePrefixesValue(patterns);
+ }
+
/** Creates a key from the main repository. */
public static SkyKey key() {
return Key.create(RepositoryName.MAIN);
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 91becad..7f2df10 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
@@ -82,7 +82,6 @@
import com.google.devtools.build.lib.vfs.BatchStat;
import com.google.devtools.build.lib.vfs.FileSystem;
import com.google.devtools.build.lib.vfs.ModifiedFileSet;
-import com.google.devtools.build.lib.vfs.PathFragment;
import com.google.devtools.build.lib.vfs.Root;
import com.google.devtools.build.lib.vfs.RootedPath;
import com.google.devtools.build.skyframe.BuildDriver;
@@ -164,8 +163,7 @@
Iterable<? extends DiffAwareness.Factory> diffAwarenessFactories,
ImmutableMap<SkyFunctionName, SkyFunction> extraSkyFunctions,
Iterable<SkyValueDirtinessChecker> customDirtinessCheckers,
- ImmutableSet<PathFragment> hardcodedBlacklistedPackagePrefixes,
- PathFragment additionalBlacklistedPackagePrefixesFile,
+ SkyFunction blacklistedPackagePrefixesFunction,
CrossRepositoryLabelViolationStrategy crossRepositoryLabelViolationStrategy,
List<BuildFileName> buildFilesByPriority,
ActionOnIOExceptionReadingBuildFile actionOnIOExceptionReadingBuildFile,
@@ -182,8 +180,7 @@
workspaceStatusActionFactory,
extraSkyFunctions,
ExternalFileAction.DEPEND_ON_EXTERNAL_PKG_FOR_EXTERNAL_REPO_PATHS,
- hardcodedBlacklistedPackagePrefixes,
- additionalBlacklistedPackagePrefixesFile,
+ blacklistedPackagePrefixesFunction,
crossRepositoryLabelViolationStrategy,
buildFilesByPriority,
actionOnIOExceptionReadingBuildFile,
@@ -961,8 +958,6 @@
protected BlazeDirectories directories;
protected ActionKeyContext actionKeyContext;
protected BuildOptions defaultBuildOptions;
- private ImmutableSet<PathFragment> hardcodedBlacklistedPackagePrefixes;
- private PathFragment additionalBlacklistedPackagePrefixesFile;
private CrossRepositoryLabelViolationStrategy crossRepositoryLabelViolationStrategy;
private List<BuildFileName> buildFilesByPriority;
private ActionOnIOExceptionReadingBuildFile actionOnIOExceptionReadingBuildFile;
@@ -976,6 +971,7 @@
private MutableArtifactFactorySupplier mutableArtifactFactorySupplier =
new MutableArtifactFactorySupplier();
private Consumer<SkyframeExecutor> skyframeExecutorConsumerOnInit = skyframeExecutor -> {};
+ private SkyFunction blacklistedPackagePrefixesFunction;
private Builder() {}
@@ -986,11 +982,10 @@
Preconditions.checkNotNull(directories);
Preconditions.checkNotNull(actionKeyContext);
Preconditions.checkNotNull(defaultBuildOptions);
- Preconditions.checkNotNull(hardcodedBlacklistedPackagePrefixes);
- Preconditions.checkNotNull(additionalBlacklistedPackagePrefixesFile);
Preconditions.checkNotNull(crossRepositoryLabelViolationStrategy);
Preconditions.checkNotNull(buildFilesByPriority);
Preconditions.checkNotNull(actionOnIOExceptionReadingBuildFile);
+ Preconditions.checkNotNull(blacklistedPackagePrefixesFunction);
SequencedSkyframeExecutor skyframeExecutor =
new SequencedSkyframeExecutor(
@@ -1004,8 +999,7 @@
diffAwarenessFactories,
extraSkyFunctions,
customDirtinessCheckers,
- hardcodedBlacklistedPackagePrefixes,
- additionalBlacklistedPackagePrefixesFile,
+ blacklistedPackagePrefixesFunction,
crossRepositoryLabelViolationStrategy,
buildFilesByPriority,
actionOnIOExceptionReadingBuildFile,
@@ -1041,6 +1035,12 @@
return this;
}
+ public Builder setBlacklistedPackagePrefixesFunction(
+ SkyFunction blacklistedPackagePrefixesFunction) {
+ this.blacklistedPackagePrefixesFunction = blacklistedPackagePrefixesFunction;
+ return this;
+ }
+
public Builder setExtraSkyFunctions(
ImmutableMap<SkyFunctionName, SkyFunction> extraSkyFunctions) {
this.extraSkyFunctions = extraSkyFunctions;
@@ -1064,18 +1064,6 @@
return this;
}
- public Builder setHardcodedBlacklistedPackagePrefixes(
- ImmutableSet<PathFragment> hardcodedBlacklistedPackagePrefixes) {
- this.hardcodedBlacklistedPackagePrefixes = hardcodedBlacklistedPackagePrefixes;
- return this;
- }
-
- public Builder setAdditionalBlacklistedPackagePrefixesFile(
- PathFragment additionalBlacklistedPackagePrefixesFile) {
- this.additionalBlacklistedPackagePrefixesFile = additionalBlacklistedPackagePrefixesFile;
- return this;
- }
-
public Builder setCrossRepositoryLabelViolationStrategy(
CrossRepositoryLabelViolationStrategy crossRepositoryLabelViolationStrategy) {
this.crossRepositoryLabelViolationStrategy = crossRepositoryLabelViolationStrategy;
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java
index 3d5e069..b19c0c5 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java
@@ -310,8 +310,7 @@
protected SkyframeIncrementalBuildMonitor incrementalBuildMonitor =
new SkyframeIncrementalBuildMonitor();
- private final ImmutableSet<PathFragment> hardcodedBlacklistedPackagePrefixes;
- private final PathFragment additionalBlacklistedPackagePrefixesFile;
+ private final SkyFunction blacklistedPackagePrefixesFunction;
private final ConfiguredRuleClassProvider ruleClassProvider;
@@ -386,8 +385,7 @@
Factory workspaceStatusActionFactory,
ImmutableMap<SkyFunctionName, SkyFunction> extraSkyFunctions,
ExternalFileAction externalFileAction,
- ImmutableSet<PathFragment> hardcodedBlacklistedPackagePrefixes,
- PathFragment additionalBlacklistedPackagePrefixesFile,
+ SkyFunction blacklistedPackagePrefixesFunction,
CrossRepositoryLabelViolationStrategy crossRepositoryLabelViolationStrategy,
List<BuildFileName> buildFilesByPriority,
ActionOnIOExceptionReadingBuildFile actionOnIOExceptionReadingBuildFile,
@@ -421,9 +419,8 @@
this.fileSystem = fileSystem;
this.directories = Preconditions.checkNotNull(directories);
this.actionKeyContext = Preconditions.checkNotNull(actionKeyContext);
+ this.blacklistedPackagePrefixesFunction = blacklistedPackagePrefixesFunction;
this.extraSkyFunctions = extraSkyFunctions;
- this.hardcodedBlacklistedPackagePrefixes = hardcodedBlacklistedPackagePrefixes;
- this.additionalBlacklistedPackagePrefixesFile = additionalBlacklistedPackagePrefixesFile;
this.ruleClassProvider = (ConfiguredRuleClassProvider) pkgFactory.getRuleClassProvider();
this.defaultBuildOptions = defaultBuildOptions;
@@ -502,10 +499,7 @@
map.put(
SkyFunctions.COLLECT_PACKAGES_UNDER_DIRECTORY,
newCollectPackagesUnderDirectoryFunction(directories));
- map.put(
- SkyFunctions.BLACKLISTED_PACKAGE_PREFIXES,
- new BlacklistedPackagePrefixesFunction(
- hardcodedBlacklistedPackagePrefixes, additionalBlacklistedPackagePrefixesFile));
+ map.put(SkyFunctions.BLACKLISTED_PACKAGE_PREFIXES, blacklistedPackagePrefixesFunction);
map.put(SkyFunctions.TESTS_IN_SUITE, new TestExpansionFunction());
map.put(SkyFunctions.TEST_SUITE_EXPANSION, new TestsForTargetPatternFunction());
map.put(SkyFunctions.TARGET_PATTERN_PHASE, new TargetPatternPhaseFunction());
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/packages/AbstractPackageLoader.java b/src/main/java/com/google/devtools/build/lib/skyframe/packages/AbstractPackageLoader.java
index b87c5d5..b5cf49e 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/packages/AbstractPackageLoader.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/packages/AbstractPackageLoader.java
@@ -422,8 +422,7 @@
.put(
SkyFunctions.BLACKLISTED_PACKAGE_PREFIXES,
new BlacklistedPackagePrefixesFunction(
- /*hardcodedBlacklistedPackagePrefixes=*/ ImmutableSet.of(),
- /*additionalBlacklistedPackagePrefixesFile=*/ PathFragment.EMPTY_FRAGMENT))
+ /*blacklistedPackagePrefixesFile=*/ PathFragment.EMPTY_FRAGMENT))
.put(SkyFunctions.CONTAINING_PACKAGE_LOOKUP, new ContainingPackageLookupFunction())
.put(SkyFunctions.AST_FILE_LOOKUP, new ASTFileLookupFunction(ruleClassProvider))
.put(
diff --git a/src/test/java/com/google/devtools/build/lib/query2/testutil/SkyframeQueryHelper.java b/src/test/java/com/google/devtools/build/lib/query2/testutil/SkyframeQueryHelper.java
index 202afa3..c6ff097 100644
--- a/src/test/java/com/google/devtools/build/lib/query2/testutil/SkyframeQueryHelper.java
+++ b/src/test/java/com/google/devtools/build/lib/query2/testutil/SkyframeQueryHelper.java
@@ -51,6 +51,7 @@
import com.google.devtools.build.lib.query2.engine.ThreadSafeOutputFormatterCallback;
import com.google.devtools.build.lib.rules.repository.RepositoryDelegatorFunction;
import com.google.devtools.build.lib.skyframe.BazelSkyframeExecutorConstants;
+import com.google.devtools.build.lib.skyframe.BlacklistedPackagePrefixesFunction;
import com.google.devtools.build.lib.skyframe.PackageValue;
import com.google.devtools.build.lib.skyframe.PrecomputedValue;
import com.google.devtools.build.lib.skyframe.SkyframeExecutor;
@@ -92,8 +93,7 @@
private boolean blockUniverseEvaluationErrors;
protected final ActionKeyContext actionKeyContext = new ActionKeyContext();
- private final PathFragment additionalBlacklistedPackagePrefixesFile =
- PathFragment.create("blacklist");
+ private final PathFragment blacklistedPackagePrefixesFile = PathFragment.create("blacklist");
@Override
public void setUp() throws Exception {
@@ -136,7 +136,7 @@
@Override
public PathFragment getBlacklistedPackagePrefixesFile() {
- return additionalBlacklistedPackagePrefixesFile;
+ return blacklistedPackagePrefixesFile;
}
@Override
@@ -313,7 +313,8 @@
.setDirectories(directories)
.setActionKeyContext(actionKeyContext)
.setDefaultBuildOptions(getDefaultBuildOptions(ruleClassProvider))
- .setAdditionalBlacklistedPackagePrefixesFile(additionalBlacklistedPackagePrefixesFile)
+ .setBlacklistedPackagePrefixesFunction(
+ new BlacklistedPackagePrefixesFunction(blacklistedPackagePrefixesFile))
.setExtraSkyFunctions(analysisMock.getSkyFunctions(directories))
.build();
skyframeExecutor.injectExtraPrecomputedValues(
diff --git a/src/test/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorTest.java b/src/test/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorTest.java
index 89d412c..a6f498c 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorTest.java
@@ -197,8 +197,7 @@
.put(
SkyFunctions.BLACKLISTED_PACKAGE_PREFIXES,
new BlacklistedPackagePrefixesFunction(
- /*hardcodedBlacklistedPackagePrefixes=*/ ImmutableSet.of(),
- /*additionalBlacklistedPackagePrefixesFile=*/ PathFragment.EMPTY_FRAGMENT))
+ /*blacklistedPackagePrefixesFile=*/ PathFragment.EMPTY_FRAGMENT))
.put(SkyFunctions.RESOLVED_HASH_VALUES, new ResolvedHashesFunction())
.build(),
differencer);
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/ContainingPackageLookupFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/ContainingPackageLookupFunctionTest.java
index 5556e96..7fcde9f 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/ContainingPackageLookupFunctionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/ContainingPackageLookupFunctionTest.java
@@ -113,10 +113,10 @@
BazelSkyframeExecutorConstants.BUILD_FILES_BY_PRIORITY));
skyFunctions.put(
SkyFunctions.PACKAGE, new PackageFunction(null, null, null, null, null, null, null));
- skyFunctions.put(SkyFunctions.BLACKLISTED_PACKAGE_PREFIXES,
+ skyFunctions.put(
+ SkyFunctions.BLACKLISTED_PACKAGE_PREFIXES,
new BlacklistedPackagePrefixesFunction(
- /*hardcodedBlacklistedPackagePrefixes=*/ ImmutableSet.of(),
- /*additionalBlacklistedPackagePrefixesFile=*/ PathFragment.EMPTY_FRAGMENT));
+ /*blacklistedPackagePrefixesFile=*/ PathFragment.EMPTY_FRAGMENT));
skyFunctions.put(
FileStateValue.FILE_STATE,
new FileStateFunction(
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/FilesetEntryFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/FilesetEntryFunctionTest.java
index c45f999..5cf4a41 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/FilesetEntryFunctionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/FilesetEntryFunctionTest.java
@@ -125,10 +125,10 @@
deletedPackages,
CrossRepositoryLabelViolationStrategy.ERROR,
BazelSkyframeExecutorConstants.BUILD_FILES_BY_PRIORITY));
- skyFunctions.put(SkyFunctions.BLACKLISTED_PACKAGE_PREFIXES,
+ skyFunctions.put(
+ SkyFunctions.BLACKLISTED_PACKAGE_PREFIXES,
new BlacklistedPackagePrefixesFunction(
- /*hardcodedBlacklistedPackagePrefixes=*/ ImmutableSet.of(),
- /*additionalBlacklistedPackagePrefixesFile=*/ PathFragment.EMPTY_FRAGMENT));
+ /*blacklistedPackagePrefixesFile=*/ PathFragment.EMPTY_FRAGMENT));
skyFunctions.put(
SkyFunctions.FILESET_ENTRY, new FilesetEntryFunction((unused) -> rootDirectory));
skyFunctions.put(SkyFunctions.WORKSPACE_NAME, new TestWorkspaceNameFunction());
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/GlobFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/GlobFunctionTest.java
index f5ee322..05f0ece 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/GlobFunctionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/GlobFunctionTest.java
@@ -172,9 +172,7 @@
BazelSkyframeExecutorConstants.BUILD_FILES_BY_PRIORITY));
skyFunctions.put(
SkyFunctions.BLACKLISTED_PACKAGE_PREFIXES,
- new BlacklistedPackagePrefixesFunction(
- /*hardcodedBlacklistedPackagePrefixes=*/ ImmutableSet.of(),
- BazelSkyframeExecutorConstants.ADDITIONAL_BLACKLISTED_PACKAGE_PREFIXES_FILE));
+ BazelSkyframeExecutorConstants.BLACKLISTED_PACKAGE_PREFIXES_FUNCTION);
skyFunctions.put(
FileStateValue.FILE_STATE,
new FileStateFunction(
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/PackageLookupFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/PackageLookupFunctionTest.java
index 51e3a53..b728e74 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/PackageLookupFunctionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/PackageLookupFunctionTest.java
@@ -85,7 +85,7 @@
private SequentialBuildDriver driver;
private RecordingDifferencer differencer;
private Path emptyPackagePath;
- private static final String ADDITIONAL_BLACKLISTED_PACKAGE_PREFIXES_FILE_PATH_STRING =
+ private static final String BLACKLISTED_PACKAGE_PREFIXES_FILE_PATH_STRING =
"config/blacklisted.txt";
protected abstract CrossRepositoryLabelViolationStrategy crossRepositoryLabelViolationStrategy();
@@ -134,10 +134,10 @@
SkyFunctions.DIRECTORY_LISTING_STATE,
new DirectoryListingStateFunction(
externalFilesHelper, new AtomicReference<>(UnixGlob.DEFAULT_SYSCALLS)));
- skyFunctions.put(SkyFunctions.BLACKLISTED_PACKAGE_PREFIXES,
+ skyFunctions.put(
+ SkyFunctions.BLACKLISTED_PACKAGE_PREFIXES,
new BlacklistedPackagePrefixesFunction(
- /*hardcodedBlacklistedPackagePrefixes=*/ ImmutableSet.of(),
- PathFragment.create(ADDITIONAL_BLACKLISTED_PACKAGE_PREFIXES_FILE_PATH_STRING)));
+ PathFragment.create(BLACKLISTED_PACKAGE_PREFIXES_FILE_PATH_STRING)));
RuleClassProvider ruleClassProvider = analysisMock.createRuleClassProvider();
skyFunctions.put(SkyFunctions.WORKSPACE_AST, new WorkspaceASTFunction(ruleClassProvider));
skyFunctions.put(
@@ -237,8 +237,8 @@
public void testBlacklistedPackage() throws Exception {
scratch.file("blacklisted/subdir/BUILD");
scratch.file("blacklisted/BUILD");
- Path blacklist = scratch.overwriteFile(
- ADDITIONAL_BLACKLISTED_PACKAGE_PREFIXES_FILE_PATH_STRING, "blacklisted");
+ Path blacklist =
+ scratch.overwriteFile(BLACKLISTED_PACKAGE_PREFIXES_FILE_PATH_STRING, "blacklisted");
ImmutableSet<String> pkgs = ImmutableSet.of("blacklisted/subdir", "blacklisted");
for (String pkg : pkgs) {
@@ -248,8 +248,7 @@
assertThat(packageLookupValue.getErrorMsg()).isNotNull();
}
- scratch.overwriteFile(
- ADDITIONAL_BLACKLISTED_PACKAGE_PREFIXES_FILE_PATH_STRING, "not_blacklisted");
+ scratch.overwriteFile(BLACKLISTED_PACKAGE_PREFIXES_FILE_PATH_STRING, "not_blacklisted");
RootedPath rootedBlacklist =
RootedPath.toRootedPath(
Root.fromPath(blacklist.getParentDirectory().getParentDirectory()),
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/PrepareDepsOfPatternsFunctionSmartNegationTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/PrepareDepsOfPatternsFunctionSmartNegationTest.java
index 65a2306..3993f50 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/PrepareDepsOfPatternsFunctionSmartNegationTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/PrepareDepsOfPatternsFunctionSmartNegationTest.java
@@ -95,8 +95,9 @@
.setDefaultBuildOptions(
DefaultBuildOptionsForTesting.getDefaultBuildOptionsForTest(ruleClassProvider))
.setExtraSkyFunctions(AnalysisMock.get().getSkyFunctions(directories))
- .setAdditionalBlacklistedPackagePrefixesFile(
- PathFragment.create(ADDITIONAL_BLACKLISTED_PACKAGE_PREFIXES_FILE_PATH_STRING))
+ .setBlacklistedPackagePrefixesFunction(
+ new BlacklistedPackagePrefixesFunction(
+ PathFragment.create(ADDITIONAL_BLACKLISTED_PACKAGE_PREFIXES_FILE_PATH_STRING)))
.build();
TestConstants.processSkyframeExecutorForTesting(skyframeExecutor);
skyframeExecutor.preparePackageLoading(
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/RecursiveFilesystemTraversalFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/RecursiveFilesystemTraversalFunctionTest.java
index 6fef6c8..c57ccd0 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/RecursiveFilesystemTraversalFunctionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/RecursiveFilesystemTraversalFunctionTest.java
@@ -157,10 +157,10 @@
deletedPackages,
CrossRepositoryLabelViolationStrategy.ERROR,
BazelSkyframeExecutorConstants.BUILD_FILES_BY_PRIORITY));
- skyFunctions.put(SkyFunctions.BLACKLISTED_PACKAGE_PREFIXES,
+ skyFunctions.put(
+ SkyFunctions.BLACKLISTED_PACKAGE_PREFIXES,
new BlacklistedPackagePrefixesFunction(
- /*hardcodedBlacklistedPackagePrefixes=*/ ImmutableSet.of(),
- /*additionalBlacklistedPackagePrefixesFile=*/ PathFragment.EMPTY_FRAGMENT));
+ /*blacklistedPackagePrefixesFile=*/ PathFragment.EMPTY_FRAGMENT));
skyFunctions.put(SkyFunctions.PACKAGE,
new PackageFunction(null, null, null, null, null, null, null));
skyFunctions.put(SkyFunctions.WORKSPACE_AST, new WorkspaceASTFunction(ruleClassProvider));
