aboutsummaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorRaphael <raphael@google.com>2011-11-13 21:23:17 -0800
committerRaphael <raphael@google.com>2011-11-14 13:46:13 -0800
commitefe1af451d561571ea8e29bbe90ccaa3b66461e4 (patch)
tree0649f79afaea2160c5aad1df626956e829295a49 /build
parent97f3e04a77af30ab32c8e22f5240c89326620867 (diff)
downloadsdk-efe1af451d561571ea8e29bbe90ccaa3b66461e4.zip
sdk-efe1af451d561571ea8e29bbe90ccaa3b66461e4.tar.gz
sdk-efe1af451d561571ea8e29bbe90ccaa3b66461e4.tar.bz2
SDK: Switch from android.bat to android.exe
Change-Id: I549340bdaaf78d6d314992ad2b91e9b45f97d2c2
Diffstat (limited to 'build')
-rwxr-xr-xbuild/tools.windows.atree2
-rw-r--r--build/windows_sdk_tools.mk3
2 files changed, 3 insertions, 2 deletions
diff --git a/build/tools.windows.atree b/build/tools.windows.atree
index cd3db99..635e185 100755
--- a/build/tools.windows.atree
+++ b/build/tools.windows.atree
@@ -19,7 +19,7 @@
#
rm tools/android
-sdk/sdkmanager/app/etc/android.bat tools/android.bat
+bin/win_android.exe strip tools/android.exe
rm tools/apkbuilder
sdk/apkbuilder/etc/apkbuilder.bat tools/apkbuilder.bat
diff --git a/build/windows_sdk_tools.mk b/build/windows_sdk_tools.mk
index a82b2c8..891f835 100644
--- a/build/windows_sdk_tools.mk
+++ b/build/windows_sdk_tools.mk
@@ -9,7 +9,8 @@ WIN_SDK_TARGETS := \
emulator-arm \
emulator-x86 \
mksdcard \
- sdklauncher
+ sdklauncher \
+ win_android
# Add OpenGLES emulation host libraries if needed.
ifeq (true,$(BUILD_EMULATOR_OPENGL))