Gather extra IUs from all reactor projects

eclipse-tycho · Dec 5, 2023 · 752f18b · 752f18b
1 parent 0aa91d4
commit 752f18b
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/tycho-core/src/main/java/org/eclipse/tycho/p2resolver/TargetPlatformFactoryImpl.java b/tycho-core/src/main/java/org/eclipse/tycho/p2resolver/TargetPlatformFactoryImpl.java
@@ -33,6 +33,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
 
@@ -264,8 +265,10 @@ public P2TargetPlatform createTargetPlatform(TargetPlatformConfigurationStub tpC
                 return Optional.empty();
             }).ifPresent(externalUIs::add);
         }
-        //add p2.inf items...
-        gatherP2InfUnits(project, externalUIs);
+        //add p2.inf extra units from all projects...
+        for (ReactorProject reactorProject : Objects.requireNonNullElse(reactorProjects, List.<ReactorProject> of())) {
+            gatherP2InfUnits(reactorProject, externalUIs);
+        }
 
         Map<IInstallableUnit, ReactorProjectIdentities> reactorProjectUIs = getPreliminaryReactorProjectUIs(
                 reactorProjects);