From c6df50f9d94e315945f1965ea35b9c9d809c0738 Mon Sep 17 00:00:00 2001
From: Raphael Moll <raphael@google.com>
Date: Wed, 24 Apr 2013 15:02:13 -0700
Subject: [PATCH] Fix dx.bat to match the new SDK structure.

(Cherry-pick from c26c1291743ce7877cf11f3dc73d6f0c240229f7)

Change-Id: Ied431777e178529f1e2360bfbd69d2738839d5c6
---
 dx/etc/dx.bat | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dx/etc/dx.bat b/dx/etc/dx.bat
index ac14fe682..6f588c44c 100755
--- a/dx/etc/dx.bat
+++ b/dx/etc/dx.bat
@@ -28,7 +28,8 @@ cd /d %~dp0
 
 rem Check we have a valid Java.exe in the path.
 set java_exe=
-call ..\tools\lib\find_java.bat
+if exist    ..\tools\lib\find_java.bat call    ..\tools\lib\find_java.bat
+if exist ..\..\tools\lib\find_java.bat call ..\..\tools\lib\find_java.bat
 if not defined java_exe goto :EOF
 
 set jarfile=dx.jar
-- 
2.11.0