aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Wright <michaelwr@google.com>2011-05-25 12:43:53 -0700
committerMichael Wright <michaelwr@google.com>2011-05-26 16:33:47 -0700
commit3c2a4833d0ea29379b192cc73645f1d8a9232c3b (patch)
tree930d96cc71f7e95642c273823a03d4e055b83314
parentfa6660afb203f98c98bec64aec941a5bc0ed4375 (diff)
downloadsdk-3c2a4833d0ea29379b192cc73645f1d8a9232c3b.zip
sdk-3c2a4833d0ea29379b192cc73645f1d8a9232c3b.tar.gz
sdk-3c2a4833d0ea29379b192cc73645f1d8a9232c3b.tar.bz2
Fixed MonkeyRunner startup script for manual build
Fixed the monkeyrunner startup script to include the proper SWT directory when monkeyrunner is started after a manual build (i.e. not from the prebuilt SDK) Change-Id: Ide8fa6949bba6f2e024ac69f8dd235795dab2a6a
-rwxr-xr-xmonkeyrunner/etc/monkeyrunner4
1 files changed, 3 insertions, 1 deletions
diff --git a/monkeyrunner/etc/monkeyrunner b/monkeyrunner/etc/monkeyrunner
index fe9be0c..b3801dd 100755
--- a/monkeyrunner/etc/monkeyrunner
+++ b/monkeyrunner/etc/monkeyrunner
@@ -81,8 +81,10 @@ else
if [ -n "$ANDROID_BUILD_TOP" ]; then
osname=`uname -s | tr A-Z a-z`
swtpath="${ANDROID_BUILD_TOP}/prebuilt/${osname}-${vmarch}/swt"
- else
+ elif [ -d "$frameworkdir/$vmarch" ]; then
swtpath="${frameworkdir}/${vmarch}"
+ else
+ swtpath="${frameworkdir}"
fi
fi