diff options
| author | Tor Norbye <tnorbye@google.com> | 2012-04-04 18:40:26 -0700 |
|---|---|---|
| committer | Tor Norbye <tnorbye@google.com> | 2012-04-05 11:41:15 -0700 |
| commit | 60b85b4ced380973f627a5882b4faae0771f0d0b (patch) | |
| tree | eff9394dca4396ea49c9b7fcc42d86280d3d5cfe /sdkmanager | |
| parent | ca22e778d384d8b632143bfa44512ca8f58da44f (diff) | |
| download | sdk-60b85b4ced380973f627a5882b4faae0771f0d0b.zip sdk-60b85b4ced380973f627a5882b4faae0771f0d0b.tar.gz sdk-60b85b4ced380973f627a5882b4faae0771f0d0b.tar.bz2 | |
Switch libraries from Eclipse 3.4 to Eclipse 3.6.2
This reverts commit f3d3fa912a10e20cadae813b80a66e538f77131d.
Change-Id: I72e28e21db3c7f959040c1fbb9df14e4d85d0df4
Diffstat (limited to 'sdkmanager')
| -rw-r--r-- | sdkmanager/app/.classpath | 6 | ||||
| -rw-r--r-- | sdkmanager/app/Android.mk | 6 | ||||
| -rw-r--r-- | sdkmanager/app/etc/manifest.txt | 2 | ||||
| -rw-r--r-- | sdkmanager/libs/sdkuilib/.classpath | 6 | ||||
| -rw-r--r-- | sdkmanager/libs/sdkuilib/Android.mk | 6 |
5 files changed, 13 insertions, 13 deletions
diff --git a/sdkmanager/app/.classpath b/sdkmanager/app/.classpath index 75e5a03..6ca79d9 100644 --- a/sdkmanager/app/.classpath +++ b/sdkmanager/app/.classpath @@ -9,9 +9,9 @@ <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3"/> <classpathentry combineaccessrules="false" kind="src" path="/common"/> <classpathentry kind="var" path="ANDROID_SRC/prebuilts/tools/linux-x86/swt/swt.jar"/> - <classpathentry kind="var" path="ANDROID_SRC/prebuilts/tools/common/eclipse/org.eclipse.core.commands_3.4.0.I20080509-2000.jar"/> - <classpathentry kind="var" path="ANDROID_SRC/prebuilts/tools/common/eclipse/org.eclipse.equinox.common_3.4.0.v20080421-2006.jar"/> - <classpathentry kind="var" path="ANDROID_SRC/prebuilts/tools/common/eclipse/org.eclipse.jface_3.4.2.M20090107-0800.jar"/> + <classpathentry kind="var" path="ANDROID_SRC/prebuilts/tools/common/eclipse/org.eclipse.core.commands_3.6.0.I20100512-1500.jar"/> + <classpathentry kind="var" path="ANDROID_SRC/prebuilts/tools/common/eclipse/org.eclipse.equinox.common_3.6.0.v20100503.jar"/> + <classpathentry kind="var" path="ANDROID_SRC/prebuilts/tools/common/eclipse/org.eclipse.jface_3.6.2.M20110210-1200.jar"/> <classpathentry kind="output" path="bin"/> </classpath> 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/.classpath b/sdkmanager/libs/sdkuilib/.classpath index 101d407..3517cf7 100644 --- a/sdkmanager/libs/sdkuilib/.classpath +++ b/sdkmanager/libs/sdkuilib/.classpath @@ -8,9 +8,9 @@ <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3"/> <classpathentry combineaccessrules="false" kind="src" path="/common"/> <classpathentry kind="var" path="ANDROID_OUT_FRAMEWORK/swtmenubar.jar" sourcepath="/ANDROID_SRC/sdk/swtmenubar/src"/> - <classpathentry kind="var" path="ANDROID_SRC/prebuilts/tools/common/eclipse/org.eclipse.core.commands_3.4.0.I20080509-2000.jar"/> - <classpathentry kind="var" path="ANDROID_SRC/prebuilts/tools/common/eclipse/org.eclipse.equinox.common_3.4.0.v20080421-2006.jar"/> - <classpathentry kind="var" path="ANDROID_SRC/prebuilts/tools/common/eclipse/org.eclipse.jface_3.4.2.M20090107-0800.jar"/> + <classpathentry kind="var" path="ANDROID_SRC/prebuilts/tools/common/eclipse/org.eclipse.core.commands_3.6.0.I20100512-1500.jar"/> + <classpathentry kind="var" path="ANDROID_SRC/prebuilts/tools/common/eclipse/org.eclipse.equinox.common_3.6.0.v20100503.jar"/> + <classpathentry kind="var" path="ANDROID_SRC/prebuilts/tools/common/eclipse/org.eclipse.jface_3.6.2.M20110210-1200.jar"/> <classpathentry kind="var" path="ANDROID_SRC/prebuilts/tools/linux-x86/swt/swt.jar"/> <classpathentry kind="output" path="bin"/> </classpath> 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 |