am 8fccf9eb: mgwz.dll must be packaged next to tools/zipalign.exe in the Windows...

Merge commit '8fccf9eb7c099a42729d0ff4a8a250f73a68c3f9' into eclair

* commit '8fccf9eb7c099a42729d0ff4a8a250f73a68c3f9':
  mgwz.dll must be packaged next to tools/zipalign.exe in the Windows SDK.

diff --combined build/tools/make_windows_sdk.sh
index aa68e17,9b688e6..d694ea4
--- 1/build/tools/make_windows_sdk.sh
--- 2/build/tools/make_windows_sdk.sh
+++ b/build/tools/make_windows_sdk.sh
@@@ -1,17 -1,11 +1,17 @@@
  #!/bin/bash
  # Quick semi-auto file to build Windows SDK tools.
  #
 -# Limitations:
 +# Limitations and requirements:
  # - Expects the emulator has been built first, will pick it up from prebuilt.
  # - Run in Cygwin
 -# - Needs Cygwin package zip
  # - Expects to have one of the existing SDK (Darwin or Linux) to build the Windows one
 +# - Needs Cygwin packages: autoconf, bison, curl, flex, gcc, g++, git,
 +#   gnupg, make, mingw-zlib, python, zip, unzip
 +# - Must NOT have cygwin package readline (its GPL license might taint the SDK if
 +#   it gets compiled in)
 +# - Does not need a Java Development Kit or any other tools outside of cygwin.
 +# - If you think you may have Windows versions of tools (e.g. make) installed, it may
 +#   reduce confusion levels to 'export PATH=/usr/bin'
  
  set -e  # Fail this script as soon as a command fails -- fail early, fail fast
  
@@@ -66,10 -60,6 +66,10 @@@ function check() 
          # SDK number if you want, but not after, e.g these are valid:
          #    android_sdk_4242_platform.zip or blah_42_.zip
          #
 +        # Note that the root directory name in the zip must match the zip
 +        # name, too, so there's no point just changing the zip name to match
 +        # the above format.
 +        #
          # SDK_NUMBER will be empty if nothing matched.
          filename=`basename "$SDK_ZIP"`
          SDK_NUMBER=`echo $filename | sed -n 's/^.*_\([^_./]\+\)_[^_.]*\..*$/\1/p'`
@@@ -195,8 -185,9 +195,9 @@@ function package() 
  
      # Copy or move platform specific tools to the default platform.
      cp -v dalvik/dx/etc/dx.bat "$PLATFORM_TOOLS"/
-     # Note: mgwz.dll must be in same folder than aapt.exe
-     mv -v "$TOOLS"/{aapt.exe,aidl.exe,dexdump.exe,mgwz.dll} "$PLATFORM_TOOLS"/
+     mv -v "$TOOLS"/{aapt.exe,aidl.exe,dexdump.exe} "$PLATFORM_TOOLS"/
+     # Note: mgwz.dll must be both in SDK/tools for zipalign and in SDK/platform/XYZ/tools/ for aapt
+     cp -v "$TOOLS"/mgwz.dll "$PLATFORM_TOOLS"/
  
      # Fix EOL chars to make window users happy - fix all files at the top level only
      # as well as all batch files including those in platforms/<name>/tools/