diff options
| author | Raphael <raphael@google.com> | 2011-12-02 21:58:23 -0800 |
|---|---|---|
| committer | Raphael <raphael@google.com> | 2012-01-23 15:50:57 -0800 |
| commit | 22fd3c107616214d2a6baecb64fe1354686cb470 (patch) | |
| tree | 4e939296e0b1dabefbb8f85e06d6a477f7180df2 /build/windows_sdk_tools.mk | |
| parent | 15863d56ac9a7bd2079fd1c2d68a14a9ecbcafc8 (diff) | |
| download | sdk-22fd3c107616214d2a6baecb64fe1354686cb470.tar.gz sdk-22fd3c107616214d2a6baecb64fe1354686cb470.tar.bz2 sdk-22fd3c107616214d2a6baecb64fe1354686cb470.zip | |
SDK Windows: more ways to find java.
Also properly redirect command-line output
to the parent shell console.
This is experimental. This CL removes "android.exe"
from the Windows tools and only keeps android.bat.
However in a next CL android.bat will be changed
to use 'find_java' to locate the best Java exe around
(this is currently done in a bat script)
Change-Id: I6e5485fdf59fde9838cf929ff333e1c611ea7bb4
Diffstat (limited to 'build/windows_sdk_tools.mk')
| -rw-r--r-- | build/windows_sdk_tools.mk | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/build/windows_sdk_tools.mk b/build/windows_sdk_tools.mk index 891f835c5..a82b2c8a8 100644 --- a/build/windows_sdk_tools.mk +++ b/build/windows_sdk_tools.mk @@ -9,8 +9,7 @@ WIN_SDK_TARGETS := \ emulator-arm \ emulator-x86 \ mksdcard \ - sdklauncher \ - win_android + sdklauncher # Add OpenGLES emulation host libraries if needed. ifeq (true,$(BUILD_EMULATOR_OPENGL)) |