Move ADT version to 18.
Change-Id: Iea99a808f6d5039ca7d021c2b557942a60f8e9ae
diff --git a/changes.txt b/changes.txt
index 7a7df55..84b450d 100644
--- a/changes.txt
+++ b/changes.txt
@@ -1,5 +1,10 @@
Change log for Android SDK Tools.
+Revision 18:
+* Fix Ant issues where some jar libraries in libs/ are not picked in some
+ cases
+* New version of SdkController
+
Revision 17:
* Bug fixes.
* ProGuard updated to version 4.7. In addition to many new features,
diff --git a/eclipse/changes.txt b/eclipse/changes.txt
index 472a2bc..978f209 100644
--- a/eclipse/changes.txt
+++ b/eclipse/changes.txt
@@ -1,3 +1,7 @@
+18.0.0
+* Fix bug 27940 where exporting release package doesn't recompile libraries
+ in release mode.
+
17.0.0:
* ADT 17 requires Java 6 and Eclipse 3.6.2.
* Improved Lint UI.
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 c6aef3c..4b6dadf 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="17.0.0.qualifier"
+ version="18.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 5b5511b..d14a253 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="17.0.0.qualifier"
+ version="18.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 6607b33..6d0295e 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="17.0.0.qualifier"
+ version="18.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 f3c7c44..e12b3b2 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="17.0.0.qualifier"
+ version="18.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 0cde667..736a77f 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="17.0.0.qualifier"
+ version="18.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 471ea08..69b14da 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="17.0.0.qualifier"
+ version="18.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 0d28db2..9ed14e1 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="17.0.0.qualifier"
+ version="18.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 92882c1..a0b0d55 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="17.0.0.qualifier"
+ version="18.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 40400bc..1aa543b 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 @@
Bundle-ManifestVersion: 2
Bundle-Name: ADT CDT Integration
Bundle-SymbolicName: com.android.ide.eclipse.adt.ndk;singleton:=true
-Bundle-Version: 17.0.0.qualifier
+Bundle-Version: 18.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 5f6786f..133f83c 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 @@
Bundle-ManifestVersion: 2
Bundle-Name: ADT XML Overlay
Bundle-SymbolicName: overlay.com.android.ide.eclipse.adt.overlay;singleton:=true
-Bundle-Version: 17.0.0.qualifier
+Bundle-Version: 18.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 5af2280..e0734ee 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 @@
Bundle-ManifestVersion: 2
Bundle-Name: Android Development Toolkit
Bundle-SymbolicName: com.android.ide.eclipse.adt;singleton:=true
-Bundle-Version: 17.0.0.qualifier
+Bundle-Version: 18.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 e7cc0f9..2ed4613 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 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: com.android.ide.eclipse.ddms;singleton:=true
-Bundle-Version: 17.0.0.qualifier
+Bundle-Version: 18.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 360455a..94f043b 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 @@
Bundle-ManifestVersion: 2
Bundle-Name: gldebugger-tests
Bundle-SymbolicName: com.android.ide.eclipse.gldebugger.tests
-Bundle-Version: 17.0.0.qualifier
+Bundle-Version: 18.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 e3ca918..3ba377b 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 @@
Bundle-ManifestVersion: 2
Bundle-Name: GLESv2 Debugger Client
Bundle-SymbolicName: com.android.ide.eclipse.gldebugger;singleton:=true
-Bundle-Version: 17.0.0.qualifier
+Bundle-Version: 18.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 14a302f..00a24c4 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 @@
Bundle-ManifestVersion: 2
Bundle-Name: Hierarchy Viewer
Bundle-SymbolicName: com.android.ide.eclipse.hierarchyviewer;singleton:=true
-Bundle-Version: 17.0.0.qualifier
+Bundle-Version: 18.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.monitor/META-INF/MANIFEST.MF b/eclipse/plugins/com.android.ide.eclipse.monitor/META-INF/MANIFEST.MF
index a25e411..59bdc21 100644
--- a/eclipse/plugins/com.android.ide.eclipse.monitor/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/com.android.ide.eclipse.monitor/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: com.android.ide.eclipse.monitor;singleton:=true
-Bundle-Version: 17.0.0.qualifier
+Bundle-Version: 18.0.0.qualifier
Bundle-Activator: com.android.ide.eclipse.monitor.MonitorPlugin
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
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 28d4863..52b626c 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 @@
Bundle-ManifestVersion: 2
Bundle-Name: Pdt
Bundle-SymbolicName: com.android.ide.eclipse.pdt;singleton:=true
-Bundle-Version: 17.0.0.qualifier
+Bundle-Version: 18.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 6fc1ed7..aea0b92 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 @@
Bundle-ManifestVersion: 2
Bundle-Name: Android Plugin Tests
Bundle-SymbolicName: com.android.ide.eclipse.tests
-Bundle-Version: 17.0.0.qualifier
+Bundle-Version: 18.0.0.qualifier
Bundle-Vendor: The Android Open Source Project
-Fragment-Host: com.android.ide.eclipse.adt;bundle-version="17.0.0"
+Fragment-Host: com.android.ide.eclipse.adt;bundle-version="18.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 a62dc10..bf05d71 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 @@
Bundle-ManifestVersion: 2
Bundle-Name: Traceview
Bundle-SymbolicName: com.android.ide.eclipse.traceview;singleton:=true
-Bundle-Version: 17.0.0.qualifier
+Bundle-Version: 18.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="17.0.0",
+ com.android.ide.eclipse.ddms;bundle-version="18.0.0",
org.eclipse.core.filesystem,
org.eclipse.core.resources
Bundle-ActivationPolicy: lazy
diff --git a/eclipse/sites/external/site.xml b/eclipse/sites/external/site.xml
index cb3cd5a..79c0f3b 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_17.0.0.qualifier.jar" id="com.android.ide.eclipse.adt" version="17.0.0.qualifier">
+ <feature url="features/com.android.ide.eclipse.adt_18.0.0.qualifier.jar" id="com.android.ide.eclipse.adt" version="18.0.0.qualifier">
<category name="developer"/>
</feature>
- <feature url="features/com.android.ide.eclipse.ddms_17.0.0.qualifier.jar" id="com.android.ide.eclipse.ddms" version="17.0.0.qualifier">
+ <feature url="features/com.android.ide.eclipse.ddms_18.0.0.qualifier.jar" id="com.android.ide.eclipse.ddms" version="18.0.0.qualifier">
<category name="developer"/>
</feature>
- <feature url="features/com.android.ide.eclipse.hierarchyviewer_17.0.0.qualifier.jar" id="com.android.ide.eclipse.hierarchyviewer" version="17.0.0.qualifier">
+ <feature url="features/com.android.ide.eclipse.hierarchyviewer_18.0.0.qualifier.jar" id="com.android.ide.eclipse.hierarchyviewer" version="18.0.0.qualifier">
<category name="developer"/>
</feature>
- <feature url="features/com.android.ide.eclipse.traceview_17.0.0.qualifier.jar" id="com.android.ide.eclipse.traceview" version="17.0.0.qualifier">
+ <feature url="features/com.android.ide.eclipse.traceview_18.0.0.qualifier.jar" id="com.android.ide.eclipse.traceview" version="18.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 1447866..8a92b99 100644
--- a/eclipse/sites/internal/site.xml
+++ b/eclipse/sites/internal/site.xml
@@ -3,31 +3,31 @@
<description url="https://android.corp.google.com/adt/">
Update Site for Android Development Toolkit
</description>
- <feature url="features/com.android.ide.eclipse.adt_17.0.0.qualifier.jar" id="com.android.ide.eclipse.adt" version="17.0.0.qualifier">
+ <feature url="features/com.android.ide.eclipse.adt_18.0.0.qualifier.jar" id="com.android.ide.eclipse.adt" version="18.0.0.qualifier">
<category name="developer"/>
</feature>
- <feature url="features/com.android.ide.eclipse.ddms_17.0.0.qualifier.jar" id="com.android.ide.eclipse.ddms" version="17.0.0.qualifier">
+ <feature url="features/com.android.ide.eclipse.ddms_18.0.0.qualifier.jar" id="com.android.ide.eclipse.ddms" version="18.0.0.qualifier">
<category name="developer"/>
<category name="platform"/>
</feature>
- <feature url="features/com.android.ide.eclipse.hierarchyviewer_17.0.0.qualifier.jar" id="com.android.ide.eclipse.hierarchyviewer" version="17.0.0.qualifier">
+ <feature url="features/com.android.ide.eclipse.hierarchyviewer_18.0.0.qualifier.jar" id="com.android.ide.eclipse.hierarchyviewer" version="18.0.0.qualifier">
<category name="developer"/>
<category name="platform"/>
</feature>
- <feature url="features/com.android.ide.eclipse.tests_17.0.0.qualifier.jar" id="com.android.ide.eclipse.tests" version="17.0.0.qualifier">
+ <feature url="features/com.android.ide.eclipse.tests_18.0.0.qualifier.jar" id="com.android.ide.eclipse.tests" version="18.0.0.qualifier">
<category name="test"/>
</feature>
- <feature url="features/com.android.ide.eclipse.pdt_17.0.0.qualifier.jar" id="com.android.ide.eclipse.pdt" version="17.0.0.qualifier">
+ <feature url="features/com.android.ide.eclipse.pdt_18.0.0.qualifier.jar" id="com.android.ide.eclipse.pdt" version="18.0.0.qualifier">
<category name="platform"/>
</feature>
- <feature url="features/com.android.ide.eclipse.traceview_17.0.0.qualifier.jar" id="com.android.ide.eclipse.traceview" version="17.0.0.qualifier">
+ <feature url="features/com.android.ide.eclipse.traceview_18.0.0.qualifier.jar" id="com.android.ide.eclipse.traceview" version="18.0.0.qualifier">
<category name="developer"/>
<category name="platform"/>
</feature>
- <feature url="features/com.android.ide.eclipse.gldebugger_17.0.0.qualifier.jar" id="com.android.ide.eclipse.gldebugger" version="17.0.0.qualifier">
+ <feature url="features/com.android.ide.eclipse.gldebugger_18.0.0.qualifier.jar" id="com.android.ide.eclipse.gldebugger" version="18.0.0.qualifier">
<category name="preview"/>
</feature>
- <feature url="features/com.android.ide.eclipse.adt.ndk_17.0.0.qualifier.jar" id="com.android.ide.eclipse.adt.ndk" version="17.0.0.qualifier">
+ <feature url="features/com.android.ide.eclipse.adt.ndk_18.0.0.qualifier.jar" id="com.android.ide.eclipse.adt.ndk" version="18.0.0.qualifier">
<category name="preview"/>
</feature>
<category-def name="developer" label="Application Developer Tools">
