Allow BlazeModules to expose a helper that PackageFactory will use for creating fresh Package instances. Also make a few Package methods public.

--
MOS_MIGRATED_REVID=123247246

1 files changed, 4 insertions, 2 deletions

diff --git a/src/tools/generate_workspace/src/main/java/com/google/devtools/build/workspace/WorkspaceResolver.java b/src/tools/generate_workspace/src/main/java/com/google/devtools/build/workspace/WorkspaceResolver.java
index 60a347c80b..53af210cce 100644
--- a/src/tools/generate_workspace/src/main/java/com/google/devtools/build/workspace/WorkspaceResolver.java
+++ b/src/tools/generate_workspace/src/main/java/com/google/devtools/build/workspace/WorkspaceResolver.java
@@ -76,8 +76,10 @@ public class WorkspaceResolver {
    * Converts the WORKSPACE file content into an ExternalPackage.
    */
   public Package parse(Path workspacePath) {
-    Package.Builder builder =
-        Package.newExternalPackageBuilder(workspacePath, ruleClassProvider.getRunfilesPrefix());
+    Package.Builder builder = Package.newExternalPackageBuilder(
+        Package.Builder.DefaultHelper.INSTANCE,
+        workspacePath,
+        ruleClassProvider.getRunfilesPrefix());
     try (Mutability mutability = Mutability.create("External Package %s", workspacePath)) {
       new WorkspaceFactory(builder, ruleClassProvider, environmentExtensions, mutability)
           .parse(ParserInputSource.create(workspacePath));