OSDN Git Service
(root)
/
android-x86
/
dalvik.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
034125a
)
Fix dx launching script to use the new platform-tools location.
author
Xavier Ducrohet
<xav@android.com>
Wed, 18 Aug 2010 22:42:19 +0000
(15:42 -0700)
committer
Xavier Ducrohet
<xav@android.com>
Wed, 18 Aug 2010 23:40:52 +0000
(16:40 -0700)
Change-Id: Ia4d316b0fb5193dc412aa5374fc270c5b10f70e5
dx/etc/dx
patch
|
blob
|
history
diff --git
a/dx/etc/dx
b/dx/etc/dx
index
f773495
..
e5cedff
100644
(file)
--- a/
dx/etc/dx
+++ b/
dx/etc/dx
@@
-36,11
+36,15
@@
cd "${oldwd}"
jarfile=dx.jar
libdir="$progdir"
+
if [ ! -r "$libdir/$jarfile" ]; then
- libdir=`dirname "$progdir"`/tools/lib
+ # set dx.jar location for the SDK case
+ libdir=`dirname "$progdir"`/platform-tools/lib
fi
+
if [ ! -r "$libdir/$jarfile" ]; then
+ # set dx.jar location for the Android tree case
libdir=`dirname "$progdir"`/framework
fi