From 8fccf9eb7c099a42729d0ff4a8a250f73a68c3f9 Mon Sep 17 00:00:00 2001 From: Raphael Date: Thu, 20 Aug 2009 21:12:01 -0700 Subject: [PATCH] mgwz.dll must be packaged next to tools/zipalign.exe in the Windows SDK. BUG 2068812 --- build/tools/make_windows_sdk.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/build/tools/make_windows_sdk.sh b/build/tools/make_windows_sdk.sh index 68e6c804a..9b688e69f 100755 --- a/build/tools/make_windows_sdk.sh +++ b/build/tools/make_windows_sdk.sh @@ -185,8 +185,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//tools/