[gentoo-commits] gentoo-x86 commit in dev-util/android-sdk-update-manager/files: android-sdk-update-manager-6-swt.patch

[Richard Freeman (rich0)]

rich0       10/08/27 01:12:22

  Modified:             android-sdk-update-manager-6-swt.patch
  Log:
  bump to fix ddms swt error - thanks to Frédéric
  (Portage version: 2.1.8.3/cvs/Linux x86_64)

Revision  Changes    Path
1.2                  dev-util/android-sdk-update-manager/files/android-sdk-update-manager-6-swt.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/android-sdk-update-manager/files/android-sdk-update-manager-6-swt.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/android-sdk-update-manager/files/android-sdk-update-manager-6-swt.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/android-sdk-update-manager/files/android-sdk-update-manager-6-swt.patch?r1=1.1&r2=1.2

Index: android-sdk-update-manager-6-swt.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-util/android-sdk-update-manager/files/android-sdk-update-manager-6-swt.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- android-sdk-update-manager-6-swt.patch	17 Aug 2010 00:38:05 -0000	1.1
+++ android-sdk-update-manager-6-swt.patch	27 Aug 2010 01:12:21 -0000	1.2
@@ -15,3 +15,20 @@
  fi
 
  # Combine the swtpath and the framework dir path.
+--- android-sdk-linux_86/tools/ddms.old         2010-08-21 18:25:12.000000000 +0200
++++ android-sdk-linux_86/tools/ddms             2010-08-26 14:44:36.000000000 +0200
+@@ -85,13 +85,7 @@
+ if [ -n "$ANDROID_SWT" ]; then
+     swtpath="$ANDROID_SWT"
+ else
+-    vmarch=`${javaCmd} -jar "${frameworkdir}"/archquery.jar`
+-    if [ -n "$ANDROID_BUILD_TOP" ]; then
+-        osname=`uname -s | tr A-Z a-z`
+-        swtpath="${ANDROID_BUILD_TOP}/prebuilt/${osname}-${vmarch}/swt"
+-    else
+-        swtpath="${frameworkdir}/${vmarch}"
+-    fi
++    swtpath=`dirname \`java-config -p swt-3.5\``
+ fi
+ 
+ # Combine the swtpath and the framework dir path.