diff options
author | Richard Freeman <rich0@gentoo.org> | 2010-08-27 01:12:23 +0000 |
---|---|---|
committer | Richard Freeman <rich0@gentoo.org> | 2010-08-27 01:12:23 +0000 |
commit | b7fe59a2b47a59013cca2eee512d0955347e0233 (patch) | |
tree | c779e7a0f896d57f603680eff9b04b8bb988d700 /dev-util/android-sdk-update-manager/files | |
parent | Version bump to 0.19 for bug #330881. (diff) | |
download | gentoo-2-b7fe59a2b47a59013cca2eee512d0955347e0233.tar.gz gentoo-2-b7fe59a2b47a59013cca2eee512d0955347e0233.tar.bz2 gentoo-2-b7fe59a2b47a59013cca2eee512d0955347e0233.zip |
bump to fix ddms swt error - thanks to Frédéric
(Portage version: 2.1.8.3/cvs/Linux x86_64)
Diffstat (limited to 'dev-util/android-sdk-update-manager/files')
-rw-r--r-- | dev-util/android-sdk-update-manager/files/android-sdk-update-manager-6-swt.patch | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/dev-util/android-sdk-update-manager/files/android-sdk-update-manager-6-swt.patch b/dev-util/android-sdk-update-manager/files/android-sdk-update-manager-6-swt.patch index 5bd8db2e4110..7a01219cf0a6 100644 --- a/dev-util/android-sdk-update-manager/files/android-sdk-update-manager-6-swt.patch +++ b/dev-util/android-sdk-update-manager/files/android-sdk-update-manager-6-swt.patch @@ -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. |