aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXavier Ducrohet <xav@android.com>2011-06-06 16:45:50 -0700
committerXavier Ducrohet <xav@android.com>2011-06-06 16:45:50 -0700
commit69a8290d3d3aeb0a5b481113730ce76180b91384 (patch)
treefd3f0e446ad29778bfaf2f59b78c807795d7b623
parentc15164523dc1374bac6bc0984e8f142b45181f98 (diff)
downloadsdk-69a8290d3d3aeb0a5b481113730ce76180b91384.zip
sdk-69a8290d3d3aeb0a5b481113730ce76180b91384.tar.gz
sdk-69a8290d3d3aeb0a5b481113730ce76180b91384.tar.bz2
Move tools to r12 and ADT to 12.0.0
Change-Id: Ifcf5190547e9e37bdda766ad3d57a312c2dbb481
-rw-r--r--eclipse/changes.txt2
-rw-r--r--eclipse/features/com.android.ide.eclipse.adt/feature.xml2
-rw-r--r--eclipse/features/com.android.ide.eclipse.ddms/feature.xml2
-rw-r--r--eclipse/features/com.android.ide.eclipse.hierarchyviewer/feature.xml2
-rw-r--r--eclipse/features/com.android.ide.eclipse.pdt/feature.xml2
-rw-r--r--eclipse/features/com.android.ide.eclipse.tests/feature.xml2
-rw-r--r--eclipse/features/com.android.ide.eclipse.traceview/feature.xml2
-rw-r--r--eclipse/plugins/com.android.ide.eclipse.adt/META-INF/MANIFEST.MF2
-rw-r--r--eclipse/plugins/com.android.ide.eclipse.ddms/META-INF/MANIFEST.MF2
-rw-r--r--eclipse/plugins/com.android.ide.eclipse.hierarchyviewer/META-INF/MANIFEST.MF2
-rw-r--r--eclipse/plugins/com.android.ide.eclipse.pdt/META-INF/MANIFEST.MF2
-rw-r--r--eclipse/plugins/com.android.ide.eclipse.tests/META-INF/MANIFEST.MF4
-rw-r--r--eclipse/plugins/com.android.ide.eclipse.traceview/META-INF/MANIFEST.MF4
-rw-r--r--eclipse/sites/external/site.xml8
-rw-r--r--eclipse/sites/internal/site.xml12
-rw-r--r--files/tools_source.properties2
16 files changed, 27 insertions, 25 deletions
diff --git a/eclipse/changes.txt b/eclipse/changes.txt
index 03e962c..9912686 100644
--- a/eclipse/changes.txt
+++ b/eclipse/changes.txt
@@ -1,3 +1,5 @@
+12.0.0
+
11.0.0
- Visual Refactoring:
- The new "Extract Style" refactoring pulls out style constants and
diff --git a/eclipse/features/com.android.ide.eclipse.adt/feature.xml b/eclipse/features/com.android.ide.eclipse.adt/feature.xml
index aeea750..5c7bc91 100644
--- a/eclipse/features/com.android.ide.eclipse.adt/feature.xml
+++ b/eclipse/features/com.android.ide.eclipse.adt/feature.xml
@@ -2,7 +2,7 @@
<feature
id="com.android.ide.eclipse.adt"
label="Android Development Tools"
- version="11.0.0.qualifier"
+ version="12.0.0.qualifier"
provider-name="The Android Open Source Project"
plugin="com.android.ide.eclipse.adt">
diff --git a/eclipse/features/com.android.ide.eclipse.ddms/feature.xml b/eclipse/features/com.android.ide.eclipse.ddms/feature.xml
index cc13984..eac0a57 100644
--- a/eclipse/features/com.android.ide.eclipse.ddms/feature.xml
+++ b/eclipse/features/com.android.ide.eclipse.ddms/feature.xml
@@ -2,7 +2,7 @@
<feature
id="com.android.ide.eclipse.ddms"
label="Android DDMS"
- version="11.0.0.qualifier"
+ version="12.0.0.qualifier"
provider-name="The Android Open Source Project"
plugin="com.android.ide.eclipse.ddms">
diff --git a/eclipse/features/com.android.ide.eclipse.hierarchyviewer/feature.xml b/eclipse/features/com.android.ide.eclipse.hierarchyviewer/feature.xml
index 9323cb0..848dfae 100644
--- a/eclipse/features/com.android.ide.eclipse.hierarchyviewer/feature.xml
+++ b/eclipse/features/com.android.ide.eclipse.hierarchyviewer/feature.xml
@@ -2,7 +2,7 @@
<feature
id="com.android.ide.eclipse.hierarchyviewer"
label="Android Hierarchy Viewer"
- version="11.0.0.qualifier"
+ version="12.0.0.qualifier"
provider-name="The Android Open Source Project"
plugin="com.android.ide.eclipse.hierarchyviewer">
diff --git a/eclipse/features/com.android.ide.eclipse.pdt/feature.xml b/eclipse/features/com.android.ide.eclipse.pdt/feature.xml
index 06eadb2..6182cdd 100644
--- a/eclipse/features/com.android.ide.eclipse.pdt/feature.xml
+++ b/eclipse/features/com.android.ide.eclipse.pdt/feature.xml
@@ -2,7 +2,7 @@
<feature
id="com.android.ide.eclipse.pdt"
label="Android Platform Development Tools"
- version="11.0.0.qualifier"
+ version="12.0.0.qualifier"
provider-name="The Android Open Source Project">
<description>
diff --git a/eclipse/features/com.android.ide.eclipse.tests/feature.xml b/eclipse/features/com.android.ide.eclipse.tests/feature.xml
index 1fb4ee7..6c31a73 100644
--- a/eclipse/features/com.android.ide.eclipse.tests/feature.xml
+++ b/eclipse/features/com.android.ide.eclipse.tests/feature.xml
@@ -2,7 +2,7 @@
<feature
id="com.android.ide.eclipse.tests"
label="ADT Tests"
- version="11.0.0.qualifier"
+ version="12.0.0.qualifier"
provider-name="The Android Open Source Project">
<copyright>
diff --git a/eclipse/features/com.android.ide.eclipse.traceview/feature.xml b/eclipse/features/com.android.ide.eclipse.traceview/feature.xml
index 4eceaa5..606e8cb 100644
--- a/eclipse/features/com.android.ide.eclipse.traceview/feature.xml
+++ b/eclipse/features/com.android.ide.eclipse.traceview/feature.xml
@@ -2,7 +2,7 @@
<feature
id="com.android.ide.eclipse.traceview"
label="Android Traceview"
- version="11.0.0.qualifier"
+ version="12.0.0.qualifier"
provider-name="The Android Open Source Project"
plugin="com.android.ide.eclipse.traceview">
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/META-INF/MANIFEST.MF b/eclipse/plugins/com.android.ide.eclipse.adt/META-INF/MANIFEST.MF
index 5214736..1cec103 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Android Development Toolkit
Bundle-SymbolicName: com.android.ide.eclipse.adt;singleton:=true
-Bundle-Version: 11.0.0.qualifier
+Bundle-Version: 12.0.0.qualifier
Bundle-ClassPath: .,
libs/androidprefs.jar,
libs/sdklib.jar,
diff --git a/eclipse/plugins/com.android.ide.eclipse.ddms/META-INF/MANIFEST.MF b/eclipse/plugins/com.android.ide.eclipse.ddms/META-INF/MANIFEST.MF
index 252be05..78b7be2 100644
--- a/eclipse/plugins/com.android.ide.eclipse.ddms/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/com.android.ide.eclipse.ddms/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: com.android.ide.eclipse.ddms;singleton:=true
-Bundle-Version: 11.0.0.qualifier
+Bundle-Version: 12.0.0.qualifier
Bundle-Activator: com.android.ide.eclipse.ddms.DdmsPlugin
Bundle-Vendor: %Bundle-Vendor
Bundle-Localization: plugin
diff --git a/eclipse/plugins/com.android.ide.eclipse.hierarchyviewer/META-INF/MANIFEST.MF b/eclipse/plugins/com.android.ide.eclipse.hierarchyviewer/META-INF/MANIFEST.MF
index d494e48..0d1e824 100644
--- a/eclipse/plugins/com.android.ide.eclipse.hierarchyviewer/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/com.android.ide.eclipse.hierarchyviewer/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Hierarchy Viewer
Bundle-SymbolicName: com.android.ide.eclipse.hierarchyviewer;singleton:=true
-Bundle-Version: 11.0.0.qualifier
+Bundle-Version: 12.0.0.qualifier
Bundle-Activator: com.android.ide.eclipse.hierarchyviewer.HierarchyViewerPlugin
Bundle-Vendor: The Android Open Source Project
Bundle-Localization: plugin
diff --git a/eclipse/plugins/com.android.ide.eclipse.pdt/META-INF/MANIFEST.MF b/eclipse/plugins/com.android.ide.eclipse.pdt/META-INF/MANIFEST.MF
index 3781ddc..88d5ab9 100644
--- a/eclipse/plugins/com.android.ide.eclipse.pdt/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/com.android.ide.eclipse.pdt/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Pdt
Bundle-SymbolicName: com.android.ide.eclipse.pdt;singleton:=true
-Bundle-Version: 11.0.0.qualifier
+Bundle-Version: 12.0.0.qualifier
Bundle-Vendor: The Android Open Source Project
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
diff --git a/eclipse/plugins/com.android.ide.eclipse.tests/META-INF/MANIFEST.MF b/eclipse/plugins/com.android.ide.eclipse.tests/META-INF/MANIFEST.MF
index b6fe951..d83adc7 100644
--- a/eclipse/plugins/com.android.ide.eclipse.tests/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/com.android.ide.eclipse.tests/META-INF/MANIFEST.MF
@@ -2,9 +2,9 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Android Plugin Tests
Bundle-SymbolicName: com.android.ide.eclipse.tests
-Bundle-Version: 11.0.0.qualifier
+Bundle-Version: 12.0.0.qualifier
Bundle-Vendor: The Android Open Source Project
-Fragment-Host: com.android.ide.eclipse.adt;bundle-version="11.0.0"
+Fragment-Host: com.android.ide.eclipse.adt;bundle-version="12.0.0"
Require-Bundle: org.junit
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ClassPath: kxml2-2.3.0.jar,
diff --git a/eclipse/plugins/com.android.ide.eclipse.traceview/META-INF/MANIFEST.MF b/eclipse/plugins/com.android.ide.eclipse.traceview/META-INF/MANIFEST.MF
index 35c62e5..66fbf66 100644
--- a/eclipse/plugins/com.android.ide.eclipse.traceview/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/com.android.ide.eclipse.traceview/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Traceview
Bundle-SymbolicName: com.android.ide.eclipse.traceview;singleton:=true
-Bundle-Version: 11.0.0.qualifier
+Bundle-Version: 12.0.0.qualifier
Bundle-Activator: com.android.ide.eclipse.traceview.TraceviewPlugin
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
org.eclipse.ui.ide,
- com.android.ide.eclipse.ddms;bundle-version="11.0.0",
+ com.android.ide.eclipse.ddms;bundle-version="12.0.0",
org.eclipse.core.filesystem,
org.eclipse.core.resources,
org.eclipse.jdt.core,
diff --git a/eclipse/sites/external/site.xml b/eclipse/sites/external/site.xml
index bd3a044..3b8afa2 100644
--- a/eclipse/sites/external/site.xml
+++ b/eclipse/sites/external/site.xml
@@ -3,16 +3,16 @@
<description url="https://dl-ssl.google.com/android/eclipse/">
Update Site for Android Development Toolkit
</description>
- <feature url="features/com.android.ide.eclipse.adt_11.0.0.qualifier.jar" id="com.android.ide.eclipse.adt" version="11.0.0.qualifier">
+ <feature url="features/com.android.ide.eclipse.adt_12.0.0.qualifier.jar" id="com.android.ide.eclipse.adt" version="12.0.0.qualifier">
<category name="developer"/>
</feature>
- <feature url="features/com.android.ide.eclipse.ddms_11.0.0.qualifier.jar" id="com.android.ide.eclipse.ddms" version="11.0.0.qualifier">
+ <feature url="features/com.android.ide.eclipse.ddms_12.0.0.qualifier.jar" id="com.android.ide.eclipse.ddms" version="12.0.0.qualifier">
<category name="developer"/>
</feature>
- <feature url="features/com.android.ide.eclipse.hierarchyviewer_11.0.0.qualifier.jar" id="com.android.ide.eclipse.hierarchyviewer" version="11.0.0.qualifier">
+ <feature url="features/com.android.ide.eclipse.hierarchyviewer_12.0.0.qualifier.jar" id="com.android.ide.eclipse.hierarchyviewer" version="12.0.0.qualifier">
<category name="developer"/>
</feature>
- <feature url="features/com.android.ide.eclipse.traceview_11.0.0.qualifier.jar" id="com.android.ide.eclipse.traceview" version="11.0.0.qualifier">
+ <feature url="features/com.android.ide.eclipse.traceview_12.0.0.qualifier.jar" id="com.android.ide.eclipse.traceview" version="12.0.0.qualifier">
<category name="developer"/>
</feature>
<category-def name="developer" label="Developer Tools">
diff --git a/eclipse/sites/internal/site.xml b/eclipse/sites/internal/site.xml
index 02ba7fe..2dfe742 100644
--- a/eclipse/sites/internal/site.xml
+++ b/eclipse/sites/internal/site.xml
@@ -3,24 +3,24 @@
<description url="https://android.corp.google.com/adt/">
Update Site for Android Development Toolkit
</description>
- <feature url="features/com.android.ide.eclipse.adt_11.0.0.qualifier.jar" id="com.android.ide.eclipse.adt" version="11.0.0.qualifier">
+ <feature url="features/com.android.ide.eclipse.adt_12.0.0.qualifier.jar" id="com.android.ide.eclipse.adt" version="12.0.0.qualifier">
<category name="developer"/>
</feature>
- <feature url="features/com.android.ide.eclipse.ddms_11.0.0.qualifier.jar" id="com.android.ide.eclipse.ddms" version="11.0.0.qualifier">
+ <feature url="features/com.android.ide.eclipse.ddms_12.0.0.qualifier.jar" id="com.android.ide.eclipse.ddms" version="12.0.0.qualifier">
<category name="developer"/>
<category name="platform"/>
</feature>
- <feature url="features/com.android.ide.eclipse.hierarchyviewer_11.0.0.qualifier.jar" id="com.android.ide.eclipse.hierarchyviewer" version="11.0.0.qualifier">
+ <feature url="features/com.android.ide.eclipse.hierarchyviewer_12.0.0.qualifier.jar" id="com.android.ide.eclipse.hierarchyviewer" version="12.0.0.qualifier">
<category name="developer"/>
<category name="platform"/>
</feature>
- <feature url="features/com.android.ide.eclipse.tests_11.0.0.qualifier.jar" id="com.android.ide.eclipse.tests" version="11.0.0.qualifier">
+ <feature url="features/com.android.ide.eclipse.tests_12.0.0.qualifier.jar" id="com.android.ide.eclipse.tests" version="12.0.0.qualifier">
<category name="test"/>
</feature>
- <feature url="features/com.android.ide.eclipse.pdt_11.0.0.qualifier.jar" id="com.android.ide.eclipse.pdt" version="11.0.0.qualifier">
+ <feature url="features/com.android.ide.eclipse.pdt_12.0.0.qualifier.jar" id="com.android.ide.eclipse.pdt" version="12.0.0.qualifier">
<category name="platform"/>
</feature>
- <feature url="features/com.android.ide.eclipse.traceview_11.0.0.qualifier.jar" id="com.android.ide.eclipse.traceview" version="11.0.0.qualifier">
+ <feature url="features/com.android.ide.eclipse.traceview_12.0.0.qualifier.jar" id="com.android.ide.eclipse.traceview" version="12.0.0.qualifier">
<category name="developer"/>
<category name="platform"/>
</feature>
diff --git a/files/tools_source.properties b/files/tools_source.properties
index ca992d1..7ed99d2 100644
--- a/files/tools_source.properties
+++ b/files/tools_source.properties
@@ -1,3 +1,3 @@
Pkg.UserSrc=false
-Pkg.Revision=11
+Pkg.Revision=12
Platform.MinPlatformToolsRev=3