commit 6e312fd1f56a691f5a01fa475838b193dadb6073
author Ying Wang <wangying@google.com> Thu Jul 11 11:59:45 2013 -0700
committer Ying Wang <wangying@google.com> Thu Jul 11 12:00:25 2013 -0700
tree 91219fff33512675a1c785054c51da5e6f23843d
parent 9faec6c700401ad4f76145b942abccc319600de9

Update the dx tools as of build #737948 in master.

Bug: 9796156
Change-Id: I02d09b08ec91c3f3725ab7a3b31c9b0b4ccc4ec5

tools/dx

diff --git a/tools/dx b/tools/dx
index e5cedff..632af43 100755
--- a/tools/dx
+++ b/tools/dx
@@ -39,7 +39,7 @@
 
 if [ ! -r "$libdir/$jarfile" ]; then
     # set dx.jar location for the SDK case
-    libdir=`dirname "$progdir"`/platform-tools/lib
+    libdir="$libdir/lib"
 fi
 
 

tools/lib/dx.jar

diff --git a/tools/lib/dx.jar b/tools/lib/dx.jar
index f89282f..746163b 100644
--- a/tools/lib/dx.jar
+++ b/tools/lib/dx.jar
Binary files differ