Move tools and adt to 16

Change-Id: I79ae1bff5086146cc60b4496f4b0464ffd642651

22 files changed, 39 insertions, 33 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 313911e..253a45e 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="14.0.0.qualifier"
+      version="16.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 5064787..b52e1d1 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="14.0.0.qualifier"
+      version="16.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 85bc7f6..4c54eba 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="14.0.0.qualifier"
+      version="16.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.gldebugger/feature.xml b/eclipse/features/com.android.ide.eclipse.gldebugger/feature.xml
index 4fe9ed0..f3502a4 100644
--- a/eclipse/features/com.android.ide.eclipse.gldebugger/feature.xml
+++ b/eclipse/features/com.android.ide.eclipse.gldebugger/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="com.android.ide.eclipse.gldebugger"
       label="GLESv2 Debugger Client"
-      version="14.0.0.qualifier"
+      version="16.0.0.qualifier"
       provider-name="The Android Open Source Project">
 
    <description>
diff --git a/eclipse/features/com.android.ide.eclipse.hierarchyviewer/feature.xml b/eclipse/features/com.android.ide.eclipse.hierarchyviewer/feature.xml
index b78c73c..37d6657 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="14.0.0.qualifier"
+      version="16.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 23cba57..2b66bf9 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="14.0.0.qualifier"
+      version="16.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 76d4267..bdffe11 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="14.0.0.qualifier"
+      version="16.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 f361f8a..36eea3b 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="14.0.0.qualifier"
+      version="16.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 ae1853c..e5eb2ba 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: 14.0.0.qualifier
+Bundle-Version: 16.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.overlay/META-INF/MANIFEST.MF b/eclipse/plugins/com.android.ide.eclipse.adt.overlay/META-INF/MANIFEST.MF
index c505787..4d3ffff 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt.overlay/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/com.android.ide.eclipse.adt.overlay/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ADT XML Overlay
 Bundle-SymbolicName: overlay.com.android.ide.eclipse.adt.overlay;singleton:=true
-Bundle-Version: 14.0.0.qualifier
+Bundle-Version: 16.0.0.qualifier
 Bundle-Vendor: The Android Open Source Project
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.core.resources,
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 8de0617..f5982a1 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: 14.0.0.qualifier
+Bundle-Version: 16.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 8139d53..949faee 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: 14.0.0.qualifier
+Bundle-Version: 16.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.gldebugger.tests/META-INF/MANIFEST.MF b/eclipse/plugins/com.android.ide.eclipse.gldebugger.tests/META-INF/MANIFEST.MF
index bd87e51..e2effdc 100644
--- a/eclipse/plugins/com.android.ide.eclipse.gldebugger.tests/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/com.android.ide.eclipse.gldebugger.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: gldebugger-tests
 Bundle-SymbolicName: com.android.ide.eclipse.gldebugger.tests
-Bundle-Version: 14.0.0.qualifier
+Bundle-Version: 16.0.0.qualifier
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Require-Bundle: org.junit4;bundle-version="4.5.0",
  com.android.ide.eclipse.gldebugger
diff --git a/eclipse/plugins/com.android.ide.eclipse.gldebugger/META-INF/MANIFEST.MF b/eclipse/plugins/com.android.ide.eclipse.gldebugger/META-INF/MANIFEST.MF
index 6e6f557..cd4a4b6 100644
--- a/eclipse/plugins/com.android.ide.eclipse.gldebugger/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/com.android.ide.eclipse.gldebugger/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: GLESv2 Debugger Client
 Bundle-SymbolicName: com.android.ide.eclipse.gldebugger;singleton:=true
-Bundle-Version: 14.0.0.qualifier
+Bundle-Version: 16.0.0.qualifier
 Bundle-Activator: com.android.ide.eclipse.gldebugger.Activator
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime
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 138a999..20c6f82 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: 14.0.0.qualifier
+Bundle-Version: 16.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 a0783c0..5b529e6 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: 14.0.0.qualifier
+Bundle-Version: 16.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 1756102..b85af50 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: 14.0.0.qualifier
+Bundle-Version: 16.0.0.qualifier
 Bundle-Vendor: The Android Open Source Project
-Fragment-Host: com.android.ide.eclipse.adt;bundle-version="14.0.0"
+Fragment-Host: com.android.ide.eclipse.adt;bundle-version="16.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 f1afd3b..b516675 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: 14.0.0.qualifier
+Bundle-Version: 16.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="13.0.0",
+ com.android.ide.eclipse.ddms;bundle-version="16.0.0",
  org.eclipse.core.filesystem,
  org.eclipse.core.resources,
  org.eclipse.jdt.core,
diff --git a/eclipse/scripts/update_version.sh b/eclipse/scripts/update_version.sh
index c7198af..c73407a 100755
--- a/eclipse/scripts/update_version.sh
+++ b/eclipse/scripts/update_version.sh
@@ -2,6 +2,7 @@
 
 OLD="$1"
 NEW="$2"
+REALOLD="$1"
 
 # sanity check in input args
 if [ -z "$OLD" ] || [ -z "$NEW" ]; then
@@ -29,3 +30,8 @@ NEW="${NEW//./\.}\.qualifier"
 # the new pattern. Old files get backuped with the .old extension.
 grep -rl "$OLD" * | grep -E "\.xml$|\.MF$" | xargs -n 1 sed -i -e "s/$OLD/$NEW/g"
 
+# do another grep for older version without the qualifier. We don't
+# want to replace those automatically as it could be something else.
+# Printing out occurence helps find ones to update manually.
+grep -rl "$REALOLD" *
+
diff --git a/eclipse/sites/external/site.xml b/eclipse/sites/external/site.xml
index df30495..483d470 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_14.0.0.qualifier.jar" id="com.android.ide.eclipse.adt" version="14.0.0.qualifier">
+   <feature url="features/com.android.ide.eclipse.adt_16.0.0.qualifier.jar" id="com.android.ide.eclipse.adt" version="16.0.0.qualifier">
       <category name="developer"/>
    </feature>
-   <feature url="features/com.android.ide.eclipse.ddms_14.0.0.qualifier.jar" id="com.android.ide.eclipse.ddms" version="14.0.0.qualifier">
+   <feature url="features/com.android.ide.eclipse.ddms_16.0.0.qualifier.jar" id="com.android.ide.eclipse.ddms" version="16.0.0.qualifier">
       <category name="developer"/>
    </feature>
-   <feature url="features/com.android.ide.eclipse.hierarchyviewer_14.0.0.qualifier.jar" id="com.android.ide.eclipse.hierarchyviewer" version="14.0.0.qualifier">
+   <feature url="features/com.android.ide.eclipse.hierarchyviewer_16.0.0.qualifier.jar" id="com.android.ide.eclipse.hierarchyviewer" version="16.0.0.qualifier">
       <category name="developer"/>
    </feature>
-   <feature url="features/com.android.ide.eclipse.traceview_14.0.0.qualifier.jar" id="com.android.ide.eclipse.traceview" version="14.0.0.qualifier">
+   <feature url="features/com.android.ide.eclipse.traceview_16.0.0.qualifier.jar" id="com.android.ide.eclipse.traceview" version="16.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 140d1e9..7ddeea4 100644
--- a/eclipse/sites/internal/site.xml
+++ b/eclipse/sites/internal/site.xml
@@ -3,28 +3,28 @@
    <description url="https://android.corp.google.com/adt/">
       Update Site for Android Development Toolkit
    </description>
-   <feature url="features/com.android.ide.eclipse.adt_14.0.0.qualifier.jar" id="com.android.ide.eclipse.adt" version="14.0.0.qualifier">
+   <feature url="features/com.android.ide.eclipse.adt_16.0.0.qualifier.jar" id="com.android.ide.eclipse.adt" version="16.0.0.qualifier">
       <category name="developer"/>
    </feature>
-   <feature url="features/com.android.ide.eclipse.ddms_14.0.0.qualifier.jar" id="com.android.ide.eclipse.ddms" version="14.0.0.qualifier">
+   <feature url="features/com.android.ide.eclipse.ddms_16.0.0.qualifier.jar" id="com.android.ide.eclipse.ddms" version="16.0.0.qualifier">
       <category name="developer"/>
       <category name="platform"/>
    </feature>
-   <feature url="features/com.android.ide.eclipse.hierarchyviewer_14.0.0.qualifier.jar" id="com.android.ide.eclipse.hierarchyviewer" version="14.0.0.qualifier">
+   <feature url="features/com.android.ide.eclipse.hierarchyviewer_16.0.0.qualifier.jar" id="com.android.ide.eclipse.hierarchyviewer" version="16.0.0.qualifier">
       <category name="developer"/>
       <category name="platform"/>
    </feature>
-   <feature url="features/com.android.ide.eclipse.tests_14.0.0.qualifier.jar" id="com.android.ide.eclipse.tests" version="14.0.0.qualifier">
+   <feature url="features/com.android.ide.eclipse.tests_16.0.0.qualifier.jar" id="com.android.ide.eclipse.tests" version="16.0.0.qualifier">
       <category name="test"/>
    </feature>
-   <feature url="features/com.android.ide.eclipse.pdt_14.0.0.qualifier.jar" id="com.android.ide.eclipse.pdt" version="14.0.0.qualifier">
+   <feature url="features/com.android.ide.eclipse.pdt_16.0.0.qualifier.jar" id="com.android.ide.eclipse.pdt" version="16.0.0.qualifier">
       <category name="platform"/>
    </feature>
-   <feature url="features/com.android.ide.eclipse.traceview_14.0.0.qualifier.jar" id="com.android.ide.eclipse.traceview" version="14.0.0.qualifier">
+   <feature url="features/com.android.ide.eclipse.traceview_16.0.0.qualifier.jar" id="com.android.ide.eclipse.traceview" version="16.0.0.qualifier">
       <category name="developer"/>
       <category name="platform"/>
    </feature>
-   <feature url="features/com.android.ide.eclipse.gldebugger_14.0.0.qualifier.jar" id="com.android.ide.eclipse.gldebugger" version="14.0.0.qualifier">
+   <feature url="features/com.android.ide.eclipse.gldebugger_16.0.0.qualifier.jar" id="com.android.ide.eclipse.gldebugger" version="16.0.0.qualifier">
       <category name="developer"/>
    </feature>
    <category-def name="developer" label="Application Developer Tools">
diff --git a/files/tools_source.properties b/files/tools_source.properties
index 1fac991..7545316 100644
--- a/files/tools_source.properties
+++ b/files/tools_source.properties
@@ -1,3 +1,3 @@
 Pkg.UserSrc=false
-Pkg.Revision=14
-Platform.MinPlatformToolsRev=8
+Pkg.Revision=16
+Platform.MinPlatformToolsRev=9