1 --- android-sdk-linux_86/tools/android.old      2010-08-16 19:56:17.522813374 -0400

     2 +++ android-sdk-linux_86/tools/android  2010-08-16 19:56:57.876813929 -0400

     3 @@ -93,13 +93,7 @@

     4  if [ -n "$ANDROID_SWT" ]; then

     5      swtpath="$ANDROID_SWT"

     6  else

     7 -    vmarch=`"${java_cmd}" -jar "${frameworkdir}/archquery.jar"`

     8 -    if [ -n "$ANDROID_BUILD_TOP" ]; then

     9 -        osname=`uname -s | tr A-Z a-z`

    10 -        swtpath="${ANDROID_BUILD_TOP}/prebuilt/${osname}-${vmarch}/swt"

    11 -    else

    12 -        swtpath="${frameworkdir}/${vmarch}"

    13 -    fi

    14 +    swtpath=`dirname \`java-config -p swt-3.5\``

    15  fi

    16 

    17  # Combine the swtpath and the framework dir path.

    18 --- android-sdk-linux_86/tools/ddms.old         2010-08-21 18:25:12.000000000 +0200

    19 +++ android-sdk-linux_86/tools/ddms             2010-08-26 14:44:36.000000000 +0200

    20 @@ -85,13 +85,7 @@

    21  if [ -n "$ANDROID_SWT" ]; then

    22      swtpath="$ANDROID_SWT"

    23  else

    24 -    vmarch=`${javaCmd} -jar "${frameworkdir}"/archquery.jar`

    25 -    if [ -n "$ANDROID_BUILD_TOP" ]; then

    26 -        osname=`uname -s | tr A-Z a-z`

    27 -        swtpath="${ANDROID_BUILD_TOP}/prebuilt/${osname}-${vmarch}/swt"

    28 -    else

    29 -        swtpath="${frameworkdir}/${vmarch}"

    30 -    fi

    31 +    swtpath=`dirname \`java-config -p swt-3.5\``

    32  fi

    33  

    34  # Combine the swtpath and the framework dir path.