|
Line
Link Here
|
| 0 |
-- android-sdk-linux_86/tools/android.old 2010-08-16 19:56:17.522813374 -0400 |
0 |
++ android-sdk-linux_86/tools/android 2010-08-16 19:56:57.876813929 -0400 |
|
Lines 93-105
Link Here
|
| 93 |
if [ -n "$ANDROID_SWT" ]; then |
93 |
if [ -n "$ANDROID_SWT" ]; then |
| 94 |
swtpath="$ANDROID_SWT" |
94 |
swtpath="$ANDROID_SWT" |
| 95 |
else |
95 |
else |
| 96 |
vmarch=`"${java_cmd}" -jar "${frameworkdir}/archquery.jar"` |
96 |
swtpath=`dirname \`java-config -p swt-3.5\`` |
| 97 |
if [ -n "$ANDROID_BUILD_TOP" ]; then |
|
|
| 98 |
osname=`uname -s | tr A-Z a-z` |
| 99 |
swtpath="${ANDROID_BUILD_TOP}/prebuilt/${osname}-${vmarch}/swt" |
| 100 |
else |
| 101 |
swtpath="${frameworkdir}/${vmarch}" |
| 102 |
fi |
| 103 |
fi |
97 |
fi |
| 104 |
# Combine the swtpath and the framework dir path. |
98 |
# Combine the swtpath and the framework dir path. |
| 105 |
-- android-sdk-linux_86/tools/ddms.old 2010-08-21 18:25:12.000000000 +0200 |
99 |
++ android-sdk-linux_86/tools/ddms 2010-08-26 14:44:36.000000000 +0200 |
|
Lines 85-97
Link Here
|
| 85 |
if [ -n "$ANDROID_SWT" ]; then |
85 |
if [ -n "$ANDROID_SWT" ]; then |
| 86 |
swtpath="$ANDROID_SWT" |
86 |
swtpath="$ANDROID_SWT" |
| 87 |
else |
87 |
else |
| 88 |
vmarch=`${javaCmd} -jar "${frameworkdir}"/archquery.jar` |
88 |
swtpath=`dirname \`java-config -p swt-3.5\`` |
| 89 |
if [ -n "$ANDROID_BUILD_TOP" ]; then |
|
|
| 90 |
osname=`uname -s | tr A-Z a-z` |
| 91 |
swtpath="${ANDROID_BUILD_TOP}/prebuilt/${osname}-${vmarch}/swt" |
| 92 |
else |
| 93 |
swtpath="${frameworkdir}/${vmarch}" |
| 94 |
fi |
| 95 |
fi |
89 |
fi |
| 96 |
|
90 |
|
| 97 |
# Combine the swtpath and the framework dir path. |
91 |
# Combine the swtpath and the framework dir path. |
