From: Xavier Ducrohet <xav@android.com>
Date: Tue, 26 Mar 2013 17:24:05 +0000 (-0700)
Subject: Fix dx to match the new SDK structure.
X-Git-Tag: android-x86-4.4-r1~28^2~18^2~11^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=cb9dfa123c6fcc43be629666837c4e6f86b476ea;p=android-x86%2Fdalvik.git

Fix dx to match the new SDK structure.

Change-Id: Id0551259e535b0006f4a2b719dbc17fa2f856242
---

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