From b0c819f896b3c579633849e3fa674a30e6978dd7 Mon Sep 17 00:00:00 2001 From: Tor Norbye Date: Mon, 19 Mar 2012 09:39:56 -0700 Subject: 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 --- ddms/app/Android.mk | 6 +++--- ddms/app/README | 2 +- ddms/app/etc/manifest.txt | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'ddms/app') diff --git a/ddms/app/Android.mk b/ddms/app/Android.mk index d1e4a52..74d0f6f 100644 --- a/ddms/app/Android.mk +++ b/ddms/app/Android.mk @@ -18,9 +18,9 @@ LOCAL_JAVA_LIBRARIES := \ ddmuilib \ swt \ swtmenubar \ - 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 := ddms include $(BUILD_HOST_JAVA_LIBRARY) diff --git a/ddms/app/README b/ddms/app/README index 42efb7b..0d9bbc4 100644 --- a/ddms/app/README +++ b/ddms/app/README @@ -45,7 +45,7 @@ In order to compile the project: - Create a new user library named ANDROID_OSGI - Add the following JAR file: - - prebuilt/common/osgi/osgi.jar + - prebuilt/common/eclipse/org.eclipse.osgi_3.*.jar ------- diff --git a/ddms/app/etc/manifest.txt b/ddms/app/etc/manifest.txt index 8c6ab23..3907767 100644 --- a/ddms/app/etc/manifest.txt +++ b/ddms/app/etc/manifest.txt @@ -1,3 +1,3 @@ Main-Class: com.android.ddms.Main -Class-Path: androidprefs.jar sdkstats.jar ddmlib.jar ddmuilib.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 jcommon-1.0.12.jar jfreechart-1.0.9.jar jfreechart-1.0.9-swt.jar osgi.jar +Class-Path: androidprefs.jar sdkstats.jar ddmlib.jar ddmuilib.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 jcommon-1.0.12.jar jfreechart-1.0.9.jar jfreechart-1.0.9-swt.jar osgi.jar -- cgit v1.1