4 files changed, 9 insertions, 6 deletions
diff --git a/ddms/app/etc/ddms b/ddms/app/etc/ddms
index 1367aeb..10b3a56 100755
--- a/ddms/app/etc/ddms
+++ b/ddms/app/etc/ddms
@@ -94,10 +94,7 @@ else
     fi
 fi
 
-# Combine the swtpath and the framework dir path.
-if [ -d "$swtpath" ]; then
-    frameworkdir="${swtpath}:${frameworkdir}"
-else
+if [ ! -d "$swtpath" ]; then
     echo "SWT folder '${swtpath}' does not exist."
     echo "Please export ANDROID_SWT to point to the folder containing swt.jar for your platform."
     exit 1
@@ -105,4 +102,4 @@ fi
 
 # need to use "java.ext.dirs" because "-jar" causes classpath to be ignored
 # might need more memory, e.g. -Xmx128M
-exec "$javaCmd" -Xmx256M $os_opts $java_debug -Djava.ext.dirs="$frameworkdir" -Dcom.android.ddms.bindir="$progdir" -jar "$jarpath" "$@"
+exec "$javaCmd" -Xmx256M $os_opts $java_debug -Dcom.android.ddms.bindir="$progdir" -classpath "$jarpath:$swtpath/swt.jar" com.android.ddms.Main "$@"
diff --git a/ddms/app/etc/ddms.bat b/ddms/app/etc/ddms.bat
index 271ac4c..86fe1d6 100755
--- a/ddms/app/etc/ddms.bat
+++ b/ddms/app/etc/ddms.bat
@@ -65,5 +65,5 @@ if exist %swt_path% goto SetPath
 :SetPath
 set javaextdirs=%swt_path%;%frameworkdir%
 
-call %java_exe% %java_debug% -Djava.ext.dirs=%javaextdirs% -Dcom.android.ddms.bindir= -jar %jarpath% %*
+call %java_exe% %java_debug% -Dcom.android.ddms.bindir= -classpath "%jarpath%;%swt_path%\swt.jar" com.android.ddms.Main %*
 
diff --git a/ddms/app/etc/manifest.txt b/ddms/app/etc/manifest.txt
index 84c8acd..bd54820 100644
--- a/ddms/app/etc/manifest.txt
+++ b/ddms/app/etc/manifest.txt
@@ -1 +1,3 @@
 Main-Class: com.android.ddms.Main
+Class-Path: androidprefs.jar sdkstats.jar ddmlib.jar ddmuilib.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
+
diff --git a/ddms/app/src/Android.mk b/ddms/app/src/Android.mk
index c62b678..bac4030 100644
--- a/ddms/app/src/Android.mk
+++ b/ddms/app/src/Android.mk
@@ -7,6 +7,10 @@ LOCAL_SRC_FILES := $(call all-subdir-java-files)
 LOCAL_JAVA_RESOURCE_DIRS := resources
 
 LOCAL_JAR_MANIFEST := ../etc/manifest.txt
+
+# If the dependency list is changed, etc/manifest.txt
+# MUST be updated as well (Except for swt.jar which is dynamically
+# added based on whether the VM is 32 or 64 bit)
 LOCAL_JAVA_LIBRARIES := \
 	androidprefs \
 	sdkstats \