diff options
| author | Raphael <raphael@google.com> | 2012-01-24 15:06:56 -0800 |
|---|---|---|
| committer | Raphael <raphael@google.com> | 2012-01-25 10:16:18 -0800 |
| commit | d2d6999d779fffe976c55db04bf523907a8743ed (patch) | |
| tree | 5a5ea7db3cac33e6f8403992ad47b1111c71c3f4 /build | |
| parent | 22fd3c107616214d2a6baecb64fe1354686cb470 (diff) | |
| download | sdk-d2d6999d779fffe976c55db04bf523907a8743ed.zip sdk-d2d6999d779fffe976c55db04bf523907a8743ed.tar.gz sdk-d2d6999d779fffe976c55db04bf523907a8743ed.tar.bz2 | |
Windows: "find_java" exe and lib for android.bat
This adds a "find_java.exe" that will be packages
in SDK/tools/lib. It will be used by android.bat
and the other launchers to locate the best version
of java to use for our tools (currently we have
a find_java.bat that uses DOS commands to achieve
something similar but more limited).
In addition this creates a static "findjavalib"
that is used by the NSIS installer to locate
java and get its version (to complain in case we
only find a Java 1.4 or lesser). The goal is for
the installer to use the same logic as the tools
will use to locate the java binary.
Change-Id: Ic2efb388135087bab9687c3332882047fd041b1c
Diffstat (limited to 'build')
| -rwxr-xr-x | build/tools.windows.atree | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/build/tools.windows.atree b/build/tools.windows.atree index 2087441..49bf10b 100755 --- a/build/tools.windows.atree +++ b/build/tools.windows.atree @@ -94,4 +94,4 @@ bin/sdklauncher.exe "SDK Manager.exe" # Supporting bat files sdk/files/post_tools_install.bat tools/lib/post_tools_install.bat sdk/files/find_java.bat tools/lib/find_java.bat - +bin/find_java.exe tools/lib/find_java.exe |