Skip to content

Commit

Permalink
Fix merge conflicts.
Browse files Browse the repository at this point in the history
  • Loading branch information
gregestren authored and katre committed Jul 19, 2021
1 parent 0d3c231 commit bb7a010
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
import com.google.devtools.build.lib.events.ExtendedEventHandler;
import com.google.devtools.build.lib.events.StoredEventHandler;
import com.google.devtools.build.lib.packages.Globber.BadGlobException;
import com.google.devtools.build.lib.packages.Package.ConfigSettingVisibilityPolicy;
import com.google.devtools.build.lib.packages.Package.Builder.PackageSettings;
import com.google.devtools.build.lib.packages.PackageValidator.InvalidPackageException;
import com.google.devtools.build.lib.packages.RuleClass.Builder.RuleClassType;
Expand Down Expand Up @@ -504,7 +505,8 @@ public Package.Builder createPackageFromAst(
ImmutableMap<String, Module> loadedModules,
RuleVisibility defaultVisibility,
StarlarkSemantics starlarkSemantics,
Globber globber)
Globber globber,
ConfigSettingVisibilityPolicy configSettingVisibilityPolicy)
throws InterruptedException {
try {
// At this point the package is guaranteed to exist,
Expand All @@ -519,7 +521,8 @@ public Package.Builder createPackageFromAst(
starlarkSemantics,
preludeModule,
loadedModules,
repositoryMapping);
repositoryMapping,
configSettingVisibilityPolicy);
} catch (InterruptedException e) {
globber.onInterrupt();
throw e;
Expand Down Expand Up @@ -823,7 +826,8 @@ Package.Builder evaluateBuildFile(
StarlarkSemantics semantics,
@Nullable Module preludeModule,
ImmutableMap<String, Module> loadedModules,
ImmutableMap<RepositoryName, RepositoryName> repositoryMapping)
ImmutableMap<RepositoryName, RepositoryName> repositoryMapping,
ConfigSettingVisibilityPolicy configSettingVisibilityPolicy)
throws InterruptedException {
Package.Builder pkgBuilder =
new Package.Builder(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1274,7 +1274,8 @@ private LoadedPackageCacheEntry loadPackage(
bzlLoadResult.loadedModules,
defaultVisibility,
starlarkSemantics,
globberWithSkyframeGlobDeps);
globberWithSkyframeGlobDeps,
configSettingVisibilityPolicy);
long loadTimeNanos = Math.max(BlazeClock.nanoTime() - startTimeNanos, 0L);
LoadedPackageCacheEntry packageCacheEntry =
new LoadedPackageCacheEntry(
Expand Down

0 comments on commit bb7a010

Please sign in to comment.