aboutsummaryrefslogtreecommitdiffstats
path: root/eclipse
diff options
context:
space:
mode:
Diffstat (limited to 'eclipse')
-rw-r--r--eclipse/features/com.android.ide.eclipse.adt.package/feature.xml95
-rw-r--r--eclipse/plugins/com.android.ide.eclipse.adt.package/META-INF/MANIFEST.MF2
-rw-r--r--eclipse/plugins/com.android.ide.eclipse.adt.package/ide.product4
3 files changed, 34 insertions, 67 deletions
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 8bddc8e..12e4ef3 100644
--- a/eclipse/features/com.android.ide.eclipse.adt.package/feature.xml
+++ b/eclipse/features/com.android.ide.eclipse.adt.package/feature.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature
id="com.android.ide.eclipse.adt.package"
- label="Android IDE Package"
- version="20.0.0.qualifier"
+ label="ADT Package"
+ version="21.0.0.qualifier"
provider-name="The Android Open Source Project"
plugin="com.android.ide.eclipse.adt.package">
@@ -27,6 +27,30 @@
version="0.0.0"
search-location="both"/>
+ <includes
+ id="com.android.ide.eclipse.ddms"
+ version="0.0.0"/>
+
+ <includes
+ id="com.android.ide.eclipse.adt"
+ version="0.0.0"/>
+
+ <includes
+ id="com.android.ide.eclipse.gldebugger"
+ version="0.0.0"/>
+
+ <includes
+ id="com.android.ide.eclipse.hierarchyviewer"
+ version="0.0.0"/>
+
+ <includes
+ id="com.android.ide.eclipse.ndk"
+ version="0.0.0"/>
+
+ <includes
+ id="com.android.ide.eclipse.traceview"
+ version="0.0.0"/>
+
<requires>
<import feature="org.eclipse.platform"/>
<import plugin="org.eclipse.equinox.app"/>
@@ -67,10 +91,10 @@
<import feature="org.eclipse.platform"/>
<import feature="org.eclipse.rcp" version="3.7.0" match="greaterOrEqual"/>
<import feature="org.eclipse.jdt" version="3.7.0" match="greaterOrEqual"/>
- <import feature="org.eclipse.wst.common_core.feature" version="3.2.3.v201011031800-7B7DFEsF7RZHOaLfS0KpNJ"/>
- <import feature="org.eclipse.wst.common_ui.feature" version="3.2.3.v201011031800-7C78FPlEdhO_oXWe4k_elbMgT1Lq"/>
- <import feature="org.eclipse.wst.xml_core.feature" version="3.2.3.v201102160550-7C7OFXcF7RZHQKIkMxMsW_"/>
- <import feature="org.eclipse.wst.xml_ui.feature" version="3.2.3.v201102160550-7H7AFUWDxumQJOi9ghcTb5YgkwEZ"/>
+ <import feature="org.eclipse.wst.common_core.feature"/>
+ <import feature="org.eclipse.wst.common_ui.feature"/>
+ <import feature="org.eclipse.wst.xml_core.feature"/>
+ <import feature="org.eclipse.wst.xml_ui.feature"/>
<import plugin="org.eclipse.core.variables"/>
<import plugin="org.eclipse.cdt.core"/>
<import plugin="org.eclipse.cdt.ui"/>
@@ -88,63 +112,6 @@
id="com.android.ide.eclipse.adt.package"
download-size="0"
install-size="0"
- version="0.0.0"
- unpack="true"/>
-
- <plugin
- id="com.android.ide.eclipse.adt"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="com.android.ide.eclipse.base"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="com.android.ide.eclipse.ddms"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="com.android.ide.eclipse.gldebugger"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="com.android.ide.eclipse.hierarchyviewer"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="com.android.ide.eclipse.traceview"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="overlay.com.android.ide.eclipse.adt.overlay"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="com.android.ide.eclipse.ndk"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
+ version="0.0.0"/>
</feature>
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt.package/META-INF/MANIFEST.MF b/eclipse/plugins/com.android.ide.eclipse.adt.package/META-INF/MANIFEST.MF
index 752f749..7dac1b2 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt.package/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/com.android.ide.eclipse.adt.package/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: ADT Package
Bundle-SymbolicName: com.android.ide.eclipse.adt.package;singleton:=true
-Bundle-Version: 20.0.0.qualifier
+Bundle-Version: 21.0.0.qualifier
Bundle-Vendor: The Android Open Source Project
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Require-Bundle: org.eclipse.platform,
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt.package/ide.product b/eclipse/plugins/com.android.ide.eclipse.adt.package/ide.product
index 599bf0f..5e34b2c 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt.package/ide.product
+++ b/eclipse/plugins/com.android.ide.eclipse.adt.package/ide.product
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<?pde version="3.5"?>
-<product name="Eclipse IDE for Android" uid="com.android.ide.eclipse.adt.package.product" id="com.android.ide.eclipse.adt.package.product" application="org.eclipse.ui.ide.workbench" version="20.0.0.qualifier" useFeatures="true" includeLaunchers="true">
+<product name="Android Developer Tools" uid="com.android.ide.eclipse.adt.package.product" id="com.android.ide.eclipse.adt.package.product" application="org.eclipse.ui.ide.workbench" version="20.0.0.qualifier" useFeatures="true" includeLaunchers="true">
<configIni use="default">
</configIni>
@@ -35,7 +35,7 @@
</plugins>
<features>
- <feature id="com.android.ide.eclipse.adt.package" version="20.0.0.qualifier"/>
+ <feature id="com.android.ide.eclipse.adt.package"/>
</features>
<configurations>