From 621d44b5d81de3a772034cf2d6c755dc96a3c750 Mon Sep 17 00:00:00 2001
From: Siva Velusamy <vsiva@google.com>
Date: Mon, 16 Jun 2014 17:14:43 -0700
Subject: Set default product

This CL fixes a bunch of issues in the packaging of the ADT product.
Specifically:
 - the correct default product is now used giving us the correct
   initial Java perspective
 - the dependencies go one way (ADT package -> ADT), and this allows
   upgrading of ADT without upgrading the ADT package.

Change-Id: I9a1b85e0bee8d073e27067e7450ce08a88609c3c
---
 .../com.android.ide.eclipse.adt.package/feature.xml     | 17 +++++++++--------
 .../features/com.android.ide.eclipse.adt/feature.xml    |  6 ------
 2 files changed, 9 insertions(+), 14 deletions(-)

(limited to 'eclipse/features')

diff --git a/eclipse/features/com.android.ide.eclipse.adt.package/feature.xml b/eclipse/features/com.android.ide.eclipse.adt.package/feature.xml
index d3320fa..80e2153 100644
--- a/eclipse/features/com.android.ide.eclipse.adt.package/feature.xml
+++ b/eclipse/features/com.android.ide.eclipse.adt.package/feature.xml
@@ -11,26 +11,27 @@
    </description>
 
    <copyright>
-      Copyright (C) 2007-2012 The Android Open Source Project
+      Copyright (C) 2007-2014 The Android Open Source Project
    </copyright>
 
    <license url="http://www.eclipse.org/org/documents/epl-v10.php">
       Note:  kxml2-2.3.0.jar is under the BSD license rather ...
    </license>
 
-   <url>
-      <update label="Android Update Site" url="https://dl-ssl.google.com/android/eclipse/"/>
-   </url>
-
    <requires>
+      <import plugin="com.android.ide.eclipse.adt" version="22.3.0" match="greaterOrEqual"/>
+      <import plugin="com.android.ide.eclipse.base" version="22.3.0" match="greaterOrEqual"/>
+      <import plugin="com.android.ide.eclipse.ddms" version="22.3.0" match="greaterOrEqual"/>
+      <import plugin="com.android.ide.eclipse.gldebugger" version="22.3.0" match="greaterOrEqual"/>
+      <import plugin="com.android.ide.eclipse.hierarchyviewer" version="22.3.0" match="greaterOrEqual"/>
+      <import plugin="com.android.ide.eclipse.traceview" version="22.3.0" match="greaterOrEqual"/>
+      <import plugin="overlay.com.android.ide.eclipse.adt.overlay"/>
       <import feature="org.eclipse.equinox.p2.user.ui"/>
-      <import feature="org.eclipse.help"/>
-      <import feature="org.eclipse.jdt"/>
-      <import feature="org.eclipse.cdt"/>
       <import feature="org.eclipse.platform"/>
       <import feature="org.eclipse.rcp"/>
       <import feature="org.eclipse.egit"/>
       <import feature="org.eclipse.egit.import"/>
+      <import feature="org.eclipse.cdt"/>
    </requires>
 
    <plugin
diff --git a/eclipse/features/com.android.ide.eclipse.adt/feature.xml b/eclipse/features/com.android.ide.eclipse.adt/feature.xml
index 599045c..333c107 100644
--- a/eclipse/features/com.android.ide.eclipse.adt/feature.xml
+++ b/eclipse/features/com.android.ide.eclipse.adt/feature.xml
@@ -158,10 +158,4 @@ This Agreement is governed by the laws of the State of New York and the intellec
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="com.android.ide.eclipse.adt.package"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
 </feature>
-- 
cgit v1.1