Always consider fragments that specify a platform filter

A fragment can declare a Eclipse-PlatformFilter to be only installed on
a given platform. If such fragment is currently wired to a host bundle,
it is quite likely that fragment is needed but the host usually do not
declare an Eclipse-ExtensibleAPI so we currently miss to add such
fragment making the native code loading fails.

This now adds some code to store the platform filter and if one is given
the fragment is always included.

Fix #1929

Author: laeubi

ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/ClasspathUtilCore.java

@@ -224,6 +224,17 @@ public static boolean hasExtensibleAPI(IPluginModelBase model) {
 		return false;
 	}
 
+	public static String getPlatformFilter(IPluginModelBase model) {
+		IPluginBase pluginBase = model.getPluginBase();
+		if (pluginBase instanceof BundlePlugin plugin) {
+			return plugin.getPlatformFilter();
+		}
+		if (pluginBase instanceof BundleFragment fragment) {
+			return fragment.getPlatformFilter();
+		}
+		return null;
+	}
+
 	public static boolean isPatchFragment(Resource desc) {
 		IPluginModelBase model = PluginRegistry.findModel(desc);
 		return model instanceof IFragmentModel i ? isPatchFragment(i.getFragment()) : false;

ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/DependencyManager.java

@@ -68,7 +68,13 @@ public enum Options {
 		 * Specifies to include all non-test fragments into the closure (must
 		 * not be combined with {@link #INCLUDE_ALL_FRAGMENTS}).
 		 */
-		INCLUDE_NON_TEST_FRAGMENTS;
+		INCLUDE_NON_TEST_FRAGMENTS,
+		/**
+		 * Option that can be set to include native fragments, that are ones
+		 * that define an {@link ICoreConstants#PLATFORM_FILTER} in their
+		 * manifest.
+		 */
+		INCLUDE_NATIVE_FRAGMENTS;
 	}
 
 	/**
@@ -168,6 +174,7 @@ public static Set<BundleDescription> findRequirementsClosure(Collection<BundleDe
 		boolean includeOptional = optionSet.contains(Options.INCLUDE_OPTIONAL_DEPENDENCIES);
 		boolean includeAllFragments = optionSet.contains(Options.INCLUDE_ALL_FRAGMENTS);
 		boolean includeNonTestFragments = optionSet.contains(Options.INCLUDE_NON_TEST_FRAGMENTS);
+		boolean includeNativeFragments = optionSet.contains(Options.INCLUDE_NATIVE_FRAGMENTS);
 		if (includeAllFragments && includeNonTestFragments) {
 			throw new AssertionError("Cannot combine INCLUDE_ALL_FRAGMENTS and INCLUDE_NON_TEST_FRAGMENTS"); //$NON-NLS-1$
 		}
@@ -195,6 +202,12 @@ public static Set<BundleDescription> findRequirementsClosure(Collection<BundleDe
 						addNewRequiredBundle(fragment, closure, pending);
 					}
 				}
+			} else if (includeNativeFragments) {
+				for (BundleDescription fragment : bundle.getFragments()) {
+					if (isNativeFragment(fragment) && !isTestWorkspaceProject(fragment)) {
+						addNewRequiredBundle(fragment, closure, pending);
+					}
+				}
 			}
 
 			if (isFragment(wiring.getRevision())) {
@@ -231,6 +244,14 @@ public static Set<BundleDescription> findRequirementsClosure(Collection<BundleDe
 		return closure;
 	}
 
+	private static boolean isNativeFragment(BundleDescription fragment) {
+		Object userObject = fragment.getUserObject();
+		if (userObject instanceof IPluginModelBase model) {
+			return ClasspathUtilCore.getPlatformFilter(model) != null;
+		}
+		return false;
+	}
+
 	private static boolean isExtensibleApi(BundleDescription bundleDescription) {
 		if (bundleDescription.getFragments().length == 0) {
 			return false;

ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/PDEAuxiliaryState.java

@@ -97,6 +97,7 @@ static class PluginInfo {
 		String localization;
 		String bundleSourceEntry;
 		boolean exportsExternalAnnotations;
+		String platformFilter;
 	}
 
 	/**
@@ -379,6 +380,7 @@ protected void addAuxiliaryData(BundleDescription desc, Map<String, String> mani
 		info.libraries = getClasspath(manifest);
 		info.hasExtensibleAPI = "true".equals(manifest.get(ICoreConstants.EXTENSIBLE_API)); //$NON-NLS-1$
 		info.isPatchFragment = "true".equals(manifest.get(ICoreConstants.PATCH_FRAGMENT)); //$NON-NLS-1$
+		info.platformFilter = manifest.get(ICoreConstants.PLATFORM_FILTER);
 		info.localization = manifest.get(Constants.BUNDLE_LOCALIZATION);
 		info.hasBundleStructure = hasBundleStructure;
 		info.bundleSourceEntry = manifest.get(ICoreConstants.ECLIPSE_SOURCE_BUNDLE);

ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/bundle/BundleFragment.java

@@ -122,4 +122,8 @@ public boolean isPatch() {
 		return "true".equals(getValue(ICoreConstants.PATCH_FRAGMENT, false)); //$NON-NLS-1$
 	}
 
+	public String getPlatformFilter() {
+		return getValue(ICoreConstants.PLATFORM_FILTER, false);
+	}
+
 }

ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/bundle/BundlePlugin.java

@@ -57,4 +57,8 @@ public boolean exportsExternalAnnotations() {
 		return "true".equals(getValue(ICoreConstants.ECLIPSE_EXPORT_EXTERNAL_ANNOTATIONS, false)); //$NON-NLS-1$
 	}
 
+	public String getPlatformFilter() {
+		return getValue(ICoreConstants.PLATFORM_FILTER, false);
+	}
+
 }

ui/org.eclipse.pde.launching/src/org/eclipse/pde/internal/launching/launcher/BundleLauncherHelper.java

@@ -558,8 +558,8 @@ private static Stream<IPluginModelBase> computeDependencies(Set<IPluginModelBase
 		}).forEach(launchBundles::add);
 
 		DependencyManager.Options[] options = includeOptional //
-				? new DependencyManager.Options[] {DependencyManager.Options.INCLUDE_OPTIONAL_DEPENDENCIES}
-				: new DependencyManager.Options[] {};
+				? new DependencyManager.Options[] {DependencyManager.Options.INCLUDE_OPTIONAL_DEPENDENCIES, DependencyManager.Options.INCLUDE_NATIVE_FRAGMENTS}
+				: new DependencyManager.Options[] {DependencyManager.Options.INCLUDE_NATIVE_FRAGMENTS};
 		Set<BundleDescription> closure = DependencyManager.findRequirementsClosure(launchBundles, options);
 		return closure.stream().map(launchBundlePlugins::get).map(Objects::requireNonNull) //
 				.filter(p -> !includedPlugins.contains(p));