Bug 566639 - Make Linux libsecret integration work for all archs
* Add back linux.x86_64 fragment to the build to preserve update path.
* Drop the requirement on the general linux fragment from the x86_64 one
as the new one is not in the build and can't be yet required.
* Remove apiAnalysis settings to not break the build by api tools
Change-Id: I996794536bcc06068fb5604293d70199074b0bf5
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
diff --git a/bundles/org.eclipse.equinox.security.linux.x86_64/.project b/bundles/org.eclipse.equinox.security.linux.x86_64/.project
index 4df9564..8d42917 100644
--- a/bundles/org.eclipse.equinox.security.linux.x86_64/.project
+++ b/bundles/org.eclipse.equinox.security.linux.x86_64/.project
@@ -20,15 +20,9 @@
<arguments>
</arguments>
</buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
</natures>
</projectDescription>
diff --git a/bundles/org.eclipse.equinox.security.linux.x86_64/META-INF/p2.inf b/bundles/org.eclipse.equinox.security.linux.x86_64/META-INF/p2.inf
index 77c093e..8b13789 100644
--- a/bundles/org.eclipse.equinox.security.linux.x86_64/META-INF/p2.inf
+++ b/bundles/org.eclipse.equinox.security.linux.x86_64/META-INF/p2.inf
@@ -1,2 +1 @@
-requires.0.namespace=org.eclipse.equinox.security.linux
-requires.0.name=Equinox Security fragment for Linux
+
diff --git a/pom.xml b/pom.xml
index 51e21fc..3f86346 100644
--- a/pom.xml
+++ b/pom.xml
@@ -85,6 +85,7 @@
<module>bundles/org.eclipse.equinox.security.macosx</module>
<module>bundles/org.eclipse.equinox.security.win32.x86_64</module>
<module>bundles/org.eclipse.equinox.security.linux</module>
+ <module>bundles/org.eclipse.equinox.security.linux.x86_64</module>
<module>bundles/org.eclipse.equinox.bidi</module>
<module>bundles/org.eclipse.equinox.cm</module>
<module>bundles/org.eclipse.equinox.console</module>
