Android: Move package content definition from feature to product

By using the product definition (instead of the EPP package feature) for
defining the product content it is possible to install some of them as
root level feature that can be updated and/or removed independently from
the package.

Bug 332989 - Allow parts of a package to upgraded or removed
https://bugs.eclipse.org/bugs/show_bug.cgi?id=332989

Change-Id: Ie74c8336d7b8d9116c7ff429a46aa2a12acec293
Signed-off-by: Markus Knauer <mknauer@eclipsesource.com>

2 files changed, 37 insertions, 30 deletions

diff --git a/packages/org.eclipse.epp.package.android.feature/feature.xml b/packages/org.eclipse.epp.package.android.feature/feature.xml
index c0b61eb3..c5ebc752 100644
--- a/packages/org.eclipse.epp.package.android.feature/feature.xml
+++ b/packages/org.eclipse.epp.package.android.feature/feature.xml
@@ -21,36 +21,14 @@
    </license>
 
    <requires>
-      <import feature="org.eclipse.andmore.android.basic.feature"/>
-      <import feature="org.eclipse.andmore.ndk.feature"/>
-      <import feature="org.eclipse.andmore.hierarchyviewer.feature"/>
-      <import feature="org.eclipse.andmore.traceview.feature"/>
-      <import feature="org.eclipse.andmore.gldebugger.feature"/>
-      <import feature="org.eclipse.buildship"/>
-      <import feature="org.eclipse.egit"/>
-      <import feature="org.eclipse.egit.import"/>
-      <import feature="org.eclipse.egit.mylyn"/>
-      <import feature="org.eclipse.epp.package.common.feature"/>
-      <import feature="org.eclipse.equinox.p2.user.ui"/>
-      <import feature="org.eclipse.help"/>
-      <import feature="org.eclipse.jdt"/>
-      <import feature="org.eclipse.jgit"/>
-      <import feature="org.eclipse.m2e.feature"/>
-      <import feature="org.eclipse.m2e.logback.feature"/>
-      <import feature="org.eclipse.mylyn.context_feature"/>
-      <import feature="org.eclipse.mylyn_feature"/>
-      <import feature="org.eclipse.mylyn.bugzilla_feature"/>
-      <import feature="org.eclipse.mylyn.git"/>
-      <import feature="org.eclipse.mylyn.hudson"/>
-      <import feature="org.eclipse.mylyn.ide_feature"/>
-      <import feature="org.eclipse.mylyn.java_feature"/>
-      <import feature="org.eclipse.mylyn.wikitext_feature"/>
-      <import feature="org.eclipse.platform"/>
-      <import feature="org.eclipse.rcp"/>
-      <import feature="org.eclipse.recommenders.rcp.feature"/>
-      <import feature="org.eclipse.recommenders.snipmatch.rcp.feature"/>
-      <import feature="org.eclipse.recommenders.mylyn.rcp.feature"/>
-      <import feature="org.eclipse.wst.xml_ui.feature"/>
+   <!--
+        All requirements to features and the content of the product are defined 
+        in the product configuration epp.product since Eclipse Neon. For further
+        details see the following bug:
+
+        Bug 332989 - Allow parts of a package to upgraded or removed
+        https://bugs.eclipse.org/bugs/show_bug.cgi?id=332989
+     -->
    </requires>
 
    <plugin
diff --git a/packages/org.eclipse.epp.package.android.product/epp.product b/packages/org.eclipse.epp.package.android.product/epp.product
index 4f4fcf0c..ebaa4639 100644
--- a/packages/org.eclipse.epp.package.android.product/epp.product
+++ b/packages/org.eclipse.epp.package.android.product/epp.product
@@ -186,6 +186,35 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
 
    <features>
       <feature id="org.eclipse.epp.package.android.feature" version="4.6.0.qualifier"/>
+      <feature id="org.eclipse.epp.package.common.feature" version="4.6.0.qualifier"/>
+      <feature id="org.eclipse.platform" version="4.6.0.qualifier"/>
+
+      <feature id="org.eclipse.andmore.android.basic.feature" installMode="root"/>
+      <feature id="org.eclipse.andmore.gldebugger.feature" installMode="root"/>
+      <feature id="org.eclipse.andmore.hierarchyviewer.feature" installMode="root"/>
+      <feature id="org.eclipse.andmore.ndk.feature" installMode="root"/>
+      <feature id="org.eclipse.andmore.traceview.feature" installMode="root"/>
+      <feature id="org.eclipse.buildship" installMode="root"/>
+      <!-- not available in Neon on 2016-02-21
+      <feature id="org.eclipse.egit.import" installMode="root"/>
+      -->
+      <feature id="org.eclipse.egit" installMode="root"/>
+      <feature id="org.eclipse.egit.mylyn" installMode="root"/>
+      <feature id="org.eclipse.jdt" installMode="root"/>
+      <feature id="org.eclipse.m2e.feature" installMode="root"/>
+      <feature id="org.eclipse.m2e.logback.feature" installMode="root"/>
+      <feature id="org.eclipse.mylyn.bugzilla_feature" installMode="root"/>
+      <feature id="org.eclipse.mylyn.context_feature" installMode="root"/>
+      <feature id="org.eclipse.mylyn_feature" installMode="root"/>
+      <feature id="org.eclipse.mylyn.git" installMode="root"/>
+      <feature id="org.eclipse.mylyn.hudson" installMode="root"/>
+      <feature id="org.eclipse.mylyn.ide_feature" installMode="root"/>
+      <feature id="org.eclipse.mylyn.java_feature" installMode="root"/>
+      <feature id="org.eclipse.mylyn.wikitext_feature" installMode="root"/>
+      <feature id="org.eclipse.recommenders.mylyn.rcp.feature" installMode="root"/>
+      <feature id="org.eclipse.recommenders.rcp.feature" installMode="root"/>
+      <feature id="org.eclipse.recommenders.snipmatch.rcp.feature" installMode="root"/>
+      <feature id="org.eclipse.wst.xml_ui.feature" installMode="root"/>
    </features>