Fix merge conflicts.

Author: gregestren

src/main/java/com/google/devtools/build/lib/packages/PackageFactory.java

@@ -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;
@@ -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,
@@ -519,7 +521,8 @@ public Package.Builder createPackageFromAst(
           starlarkSemantics,
           preludeModule,
           loadedModules,
-          repositoryMapping);
+          repositoryMapping,
+          configSettingVisibilityPolicy);
     } catch (InterruptedException e) {
       globber.onInterrupt();
       throw e;
@@ -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(

src/main/java/com/google/devtools/build/lib/skyframe/PackageFunction.java

@@ -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(