aboutsummaryrefslogtreecommitdiffstats
path: root/sdkmanager
diff options
context:
space:
mode:
authorTor Norbye <tnorbye@google.com>2012-03-19 09:39:56 -0700
committerTor Norbye <tnorbye@google.com>2012-04-02 16:12:15 -0700
commitb0c819f896b3c579633849e3fa674a30e6978dd7 (patch)
tree312f2cdccb1dc7ec2bbefcd303934848c14c6ac2 /sdkmanager
parentdfe7233d24be55c64cf5f0344f3f97d6aba48bbd (diff)
downloadsdk-b0c819f896b3c579633849e3fa674a30e6978dd7.zip
sdk-b0c819f896b3c579633849e3fa674a30e6978dd7.tar.gz
sdk-b0c819f896b3c579633849e3fa674a30e6978dd7.tar.bz2
Switch libraries from Eclipse 3.4 to Eclipse 3.6.2
This updates the org.eclipse.core.command, org.eclipse.jface and org.eclipse.equinox libraries from Eclipse 3.4 to Eclipse 3.6.2. It also updates SWT from 3.4 to 3.6.2 (and this drops the Carbon support from the SwtMenuBar library since SWT 3.5 switched to Cocoa by default.) Change-Id: I7e8a6e3b8cb473f90eca3b90e3f3dc5fa5099b71
Diffstat (limited to 'sdkmanager')
-rw-r--r--sdkmanager/app/Android.mk6
-rw-r--r--sdkmanager/app/etc/manifest.txt2
-rw-r--r--sdkmanager/libs/sdkuilib/Android.mk6
3 files changed, 7 insertions, 7 deletions
diff --git a/sdkmanager/app/Android.mk b/sdkmanager/app/Android.mk
index d7b630e..6431695 100644
--- a/sdkmanager/app/Android.mk
+++ b/sdkmanager/app/Android.mk
@@ -20,9 +20,9 @@ LOCAL_JAVA_LIBRARIES := \
sdklib \
sdkuilib \
swt \
- org.eclipse.jface_3.4.2.M20090107-0800 \
- org.eclipse.equinox.common_3.4.0.v20080421-2006 \
- org.eclipse.core.commands_3.4.0.I20080509-2000
+ org.eclipse.jface_3.6.2.M20110210-1200 \
+ org.eclipse.equinox.common_3.6.0.v20100503 \
+ org.eclipse.core.commands_3.6.0.I20100512-1500
LOCAL_MODULE := sdkmanager
diff --git a/sdkmanager/app/etc/manifest.txt b/sdkmanager/app/etc/manifest.txt
index bb2e8c4..12d22e5 100644
--- a/sdkmanager/app/etc/manifest.txt
+++ b/sdkmanager/app/etc/manifest.txt
@@ -1,2 +1,2 @@
Main-Class: com.android.sdkmanager.Main
-Class-Path: androidprefs.jar common.jar sdklib.jar sdkuilib.jar swtmenubar.jar org.eclipse.jface_3.4.2.M20090107-0800.jar org.eclipse.equinox.common_3.4.0.v20080421-2006.jar org.eclipse.core.commands_3.4.0.I20080509-2000.jar
+Class-Path: androidprefs.jar common.jar sdklib.jar sdkuilib.jar swtmenubar.jar org.eclipse.jface_3.6.2.M20110210-1200.jar org.eclipse.equinox.common_3.6.0.v20100503.jar org.eclipse.core.commands_3.6.0.I20100512-1500.jar
diff --git a/sdkmanager/libs/sdkuilib/Android.mk b/sdkmanager/libs/sdkuilib/Android.mk
index 740615e..3ce5c95 100644
--- a/sdkmanager/libs/sdkuilib/Android.mk
+++ b/sdkmanager/libs/sdkuilib/Android.mk
@@ -29,9 +29,9 @@ LOCAL_JAVA_LIBRARIES := \
androidprefs \
swtmenubar \
swt \
- org.eclipse.jface_3.4.2.M20090107-0800 \
- org.eclipse.equinox.common_3.4.0.v20080421-2006 \
- org.eclipse.core.commands_3.4.0.I20080509-2000
+ org.eclipse.jface_3.6.2.M20110210-1200 \
+ org.eclipse.equinox.common_3.6.0.v20100503 \
+ org.eclipse.core.commands_3.6.0.I20100512-1500
LOCAL_MODULE := sdkuilib