Mercurial Mercurial > gentoo-repos / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
dev-util/android-sdk-update-manager/ddms-swt.patch
author Da Risk <da_risk@beem-project.com>
Tue, 07 Jun 2011 22:32:58 +0200
changeset 23 15f88ae909f1
parent 0 58d5cc68f922
permissions -rw-r--r--
Fix android-sdk-update-manager to use a fake SWT_PATH if use -X
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
0
58d5cc68f922 Initial import
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
     1
 
--- android-sdk-linux_86/tools/ddms.old         2010-08-21 18:25:12.000000000 +0200
58d5cc68f922 Initial import
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
     2
 
+++ android-sdk-linux_86/tools/ddms             2010-08-26 14:44:36.000000000 +0200
58d5cc68f922 Initial import
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
     3
 
@@ -85,13 +85,7 @@
58d5cc68f922 Initial import
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
     4
 
 if [ -n "$ANDROID_SWT" ]; then
58d5cc68f922 Initial import
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
     5
 
     swtpath="$ANDROID_SWT"
58d5cc68f922 Initial import
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
     6
 
 else
58d5cc68f922 Initial import
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
     7
 
-    vmarch=`${javaCmd} -jar "${frameworkdir}"/archquery.jar`
58d5cc68f922 Initial import
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
     8
 
-    if [ -n "$ANDROID_BUILD_TOP" ]; then
58d5cc68f922 Initial import
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
     9
 
-        osname=`uname -s | tr A-Z a-z`
58d5cc68f922 Initial import
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    10
 
-        swtpath="${ANDROID_BUILD_TOP}/prebuilt/${osname}-${vmarch}/swt"
58d5cc68f922 Initial import
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    11
 
-    else
58d5cc68f922 Initial import
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    12
 
-        swtpath="${frameworkdir}/${vmarch}"
58d5cc68f922 Initial import
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    13
 
-    fi
58d5cc68f922 Initial import
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    14
 
+    swtpath=`dirname \`java-config -p swt-3.5\``
58d5cc68f922 Initial import
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    15
 
 fi
58d5cc68f922 Initial import
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    16
58d5cc68f922 Initial import
Da Risk <darisk972@gmail.com>
parents:
diff changeset 
    17
 
 # Combine the swtpath and the framework dir path.
gentoo repos