resolve all the manifests in manifest folder (#7555)

defold · Apr 6, 2023 · 2467e9d · 2467e9d
1 parent 50658fc
commit 2467e9d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/com.dynamo.cr/com.dynamo.cr.bob/src/com/dynamo/bob/bundle/BundleHelper.java b/com.dynamo.cr/com.dynamo.cr.bob/src/com/dynamo/bob/bundle/BundleHelper.java
@@ -218,7 +218,7 @@ public List<ExtenderResource> writeManifestFiles(Platform platform, File manifes
         bundler.updateManifestProperties(project, platform, this.projectProperties, this.propertiesMap, properties);
 
         // First, list all extension manifests
-        List<IResource> sourceManifests = ExtenderUtil.getExtensionPlatformManifests(project, platform, bundler.getMainManifestName(platform));
+        List<IResource> sourceManifests = ExtenderUtil.getExtensionPlatformManifests(project, platform);
         // Put the main manifest in front
         sourceManifests.add(0, mainManifest);
 

diff --git a/com.dynamo.cr/com.dynamo.cr.bob/src/com/dynamo/bob/pipeline/ExtenderUtil.java b/com.dynamo.cr/com.dynamo.cr.bob/src/com/dynamo/bob/pipeline/ExtenderUtil.java
@@ -603,7 +603,7 @@ public static void checkProjectForDuplicates(Project project) throws CompileExce
 
     /** Get the platform manifests from the extensions
      */
-    public static List<IResource> getExtensionPlatformManifests(Project project, Platform platform, String name) throws CompileExceptionError {
+    public static List<IResource> getExtensionPlatformManifests(Project project, Platform platform) throws CompileExceptionError {
         List<IResource> out = new ArrayList<>();
 
         List<String> platformFolderAlternatives = new ArrayList<String>();
@@ -618,9 +618,7 @@ public static List<IResource> getExtensionPlatformManifests(Project project, Pla
                     if (!(r instanceof FSExtenderResource))
                         continue;
                     File f = new File(r.getAbsPath());
-                    if (f.getName().equals(name)) {
-                        out.add( ((FSExtenderResource)r).getResource() );
-                    }
+                    out.add( ((FSExtenderResource)r).getResource() );
                 }
             }
         }