diff options
author | Xavier Ducrohet <xav@android.com> | 2011-08-03 11:04:38 -0700 |
---|---|---|
committer | Android Code Review <code-review@android.com> | 2011-08-03 11:04:38 -0700 |
commit | 494ff8c4edbf7aa97dd95bf8427a8e218a8b87ce (patch) | |
tree | 636e58df465fbbf805aae0a417eccaec50d6bd0b | |
parent | 9a85c3a615b92c28ce504e13565d7ca2f7339bd3 (diff) | |
parent | c5f5a6ed7e58d38d1d4f1a39284536678981361e (diff) | |
download | sdk-494ff8c4edbf7aa97dd95bf8427a8e218a8b87ce.zip sdk-494ff8c4edbf7aa97dd95bf8427a8e218a8b87ce.tar.gz sdk-494ff8c4edbf7aa97dd95bf8427a8e218a8b87ce.tar.bz2 |
Merge "Update tools/ADT to rev 14."
17 files changed, 27 insertions, 27 deletions
diff --git a/eclipse/features/com.android.ide.eclipse.adt.ndk/feature.xml b/eclipse/features/com.android.ide.eclipse.adt.ndk/feature.xml index d8ef2dd..313911e 100644 --- a/eclipse/features/com.android.ide.eclipse.adt.ndk/feature.xml +++ b/eclipse/features/com.android.ide.eclipse.adt.ndk/feature.xml @@ -2,7 +2,7 @@ <feature id="com.android.ide.eclipse.adt.ndk" label="Android Native Development Tools" - version="13.0.0.qualifier" + version="14.0.0.qualifier" provider-name="The Android Open Source Project"> <description> diff --git a/eclipse/features/com.android.ide.eclipse.adt/feature.xml b/eclipse/features/com.android.ide.eclipse.adt/feature.xml index 961d508..7c85b4f 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="13.0.0.qualifier" + version="14.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 dd6fb0d..70e1803 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="13.0.0.qualifier" + version="14.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 4e53c6b..15c9be9 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="13.0.0.qualifier" + version="14.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 ca55b1d..099fdf5 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="13.0.0.qualifier" + version="14.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 a6881fe..f8c8192 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="13.0.0.qualifier" + version="14.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 74a697f..f361f8a 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="13.0.0.qualifier" + version="14.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.ndk/META-INF/MANIFEST.MF b/eclipse/plugins/com.android.ide.eclipse.adt.ndk/META-INF/MANIFEST.MF index 8cdfc18..ae1853c 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt.ndk/META-INF/MANIFEST.MF +++ b/eclipse/plugins/com.android.ide.eclipse.adt.ndk/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: ADT CDT Integration Bundle-SymbolicName: com.android.ide.eclipse.adt.ndk;singleton:=true -Bundle-Version: 13.0.0.qualifier +Bundle-Version: 14.0.0.qualifier Bundle-Activator: com.android.ide.eclipse.adt.ndk.internal.Activator Bundle-Vendor: The Android Open Source Project Require-Bundle: org.eclipse.core.runtime, 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 9218d6d..49f73e6 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: 13.0.0.qualifier +Bundle-Version: 14.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 cd87fe1..8139d53 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: 13.0.0.qualifier +Bundle-Version: 14.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 31ca654..138a999 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: 13.0.0.qualifier +Bundle-Version: 14.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 dbf5d99..a0783c0 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: 13.0.0.qualifier +Bundle-Version: 14.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 b637fb1..1756102 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: 13.0.0.qualifier +Bundle-Version: 14.0.0.qualifier Bundle-Vendor: The Android Open Source Project -Fragment-Host: com.android.ide.eclipse.adt;bundle-version="13.0.0" +Fragment-Host: com.android.ide.eclipse.adt;bundle-version="14.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 8455b02..f1afd3b 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,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Traceview Bundle-SymbolicName: com.android.ide.eclipse.traceview;singleton:=true -Bundle-Version: 13.0.0.qualifier +Bundle-Version: 14.0.0.qualifier Bundle-Activator: com.android.ide.eclipse.traceview.TraceviewPlugin Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, diff --git a/eclipse/sites/external/site.xml b/eclipse/sites/external/site.xml index bd3f3e2..df30495 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_13.0.0.qualifier.jar" id="com.android.ide.eclipse.adt" version="13.0.0.qualifier"> + <feature url="features/com.android.ide.eclipse.adt_14.0.0.qualifier.jar" id="com.android.ide.eclipse.adt" version="14.0.0.qualifier"> <category name="developer"/> </feature> - <feature url="features/com.android.ide.eclipse.ddms_13.0.0.qualifier.jar" id="com.android.ide.eclipse.ddms" version="13.0.0.qualifier"> + <feature url="features/com.android.ide.eclipse.ddms_14.0.0.qualifier.jar" id="com.android.ide.eclipse.ddms" version="14.0.0.qualifier"> <category name="developer"/> </feature> - <feature url="features/com.android.ide.eclipse.hierarchyviewer_13.0.0.qualifier.jar" id="com.android.ide.eclipse.hierarchyviewer" version="13.0.0.qualifier"> + <feature url="features/com.android.ide.eclipse.hierarchyviewer_14.0.0.qualifier.jar" id="com.android.ide.eclipse.hierarchyviewer" version="14.0.0.qualifier"> <category name="developer"/> </feature> - <feature url="features/com.android.ide.eclipse.traceview_13.0.0.qualifier.jar" id="com.android.ide.eclipse.traceview" version="13.0.0.qualifier"> + <feature url="features/com.android.ide.eclipse.traceview_14.0.0.qualifier.jar" id="com.android.ide.eclipse.traceview" version="14.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 c92e4ce..3ace6c7 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_13.0.0.qualifier.jar" id="com.android.ide.eclipse.adt" version="13.0.0.qualifier"> + <feature url="features/com.android.ide.eclipse.adt_14.0.0.qualifier.jar" id="com.android.ide.eclipse.adt" version="14.0.0.qualifier"> <category name="developer"/> </feature> - <feature url="features/com.android.ide.eclipse.ddms_13.0.0.qualifier.jar" id="com.android.ide.eclipse.ddms" version="13.0.0.qualifier"> + <feature url="features/com.android.ide.eclipse.ddms_14.0.0.qualifier.jar" id="com.android.ide.eclipse.ddms" version="14.0.0.qualifier"> <category name="developer"/> <category name="platform"/> </feature> - <feature url="features/com.android.ide.eclipse.hierarchyviewer_13.0.0.qualifier.jar" id="com.android.ide.eclipse.hierarchyviewer" version="13.0.0.qualifier"> + <feature url="features/com.android.ide.eclipse.hierarchyviewer_14.0.0.qualifier.jar" id="com.android.ide.eclipse.hierarchyviewer" version="14.0.0.qualifier"> <category name="developer"/> <category name="platform"/> </feature> - <feature url="features/com.android.ide.eclipse.tests_13.0.0.qualifier.jar" id="com.android.ide.eclipse.tests" version="13.0.0.qualifier"> + <feature url="features/com.android.ide.eclipse.tests_14.0.0.qualifier.jar" id="com.android.ide.eclipse.tests" version="14.0.0.qualifier"> <category name="test"/> </feature> - <feature url="features/com.android.ide.eclipse.pdt_13.0.0.qualifier.jar" id="com.android.ide.eclipse.pdt" version="13.0.0.qualifier"> + <feature url="features/com.android.ide.eclipse.pdt_14.0.0.qualifier.jar" id="com.android.ide.eclipse.pdt" version="14.0.0.qualifier"> <category name="platform"/> </feature> - <feature url="features/com.android.ide.eclipse.traceview_13.0.0.qualifier.jar" id="com.android.ide.eclipse.traceview" version="13.0.0.qualifier"> + <feature url="features/com.android.ide.eclipse.traceview_14.0.0.qualifier.jar" id="com.android.ide.eclipse.traceview" version="14.0.0.qualifier"> <category name="developer"/> <category name="platform"/> </feature> diff --git a/files/tools_source.properties b/files/tools_source.properties index 77e52b2..1fac991 100644 --- a/files/tools_source.properties +++ b/files/tools_source.properties @@ -1,3 +1,3 @@ Pkg.UserSrc=false -Pkg.Revision=13 -Platform.MinPlatformToolsRev=3 +Pkg.Revision=14 +Platform.MinPlatformToolsRev=8 |