Merge commit '4336dcc64ba518b7c8bd0e4a9a9814064eb8920c'
* commit '4336dcc64ba518b7c8bd0e4a9a9814064eb8920c':
Update win_sdk to put binaries in SDK/platform-tools.
This is requires as a follow up to Change I4526310a
with moved platform tools from $SDK/platform/*/tools
to $SDK/platform-tools/
SDK Bug: 2897406
Change-Id: I1563c88fc824db3d9c86fb65479820989d46895c
The makefile makes it possible to "make PRODUCT-sdk-win_sdk".
It builds the Linux SDK, mirrors it as a Windows SDK and then use the shell
script to patch in all the Windows binaries.
(Merge master Change Ie24f765b)
The makefile makes it possible to "make PRODUCT-sdk-win_sdk".
It builds the Linux SDK, mirrors it as a Windows SDK and then use the shell
script to patch in all the Windows binaries.
Change-Id: Ie24f765bbe5201266efcb1c4cdcdead4ced35ef6
SDK Bug 2478848: emulator fails to build because sdl-config
was not checkout as +x by git/cygwin.
SDK Bug 2479321: aapt built using Cygwin 1.7.x depends on some
new cygwin DLL instead of mgwz.dll. The latter DLL is not even
present and fails to be bundled. This does not change the behavior,
it just makes sure we are using the proper version of cygwin.
Also add a source.properties (we'll install it on the vendor/google
script part of the script).
SDK BUG 2173135
Change-Id: Icb0f22a65ffd819bf7b0f48adbec51cbc1243f71
Merge commit '8fccf9eb7c099a42729d0ff4a8a250f73a68c3f9' into eclair
* commit '8fccf9eb7c099a42729d0ff4a8a250f73a68c3f9':
mgwz.dll must be packaged next to tools/zipalign.exe in the Windows SDK.
Merge commit 'a901c3d41203e6cbbf5cd72722fcf78f5919feff'
* commit 'a901c3d41203e6cbbf5cd72722fcf78f5919feff':
BUG 2033924: Add AdbWinUsbApi.dll to prebuilt for Windows SDK
Merge commit '5379e0981ebd570faba0dcd13c087f71d856e0f0'
* commit '5379e0981ebd570faba0dcd13c087f71d856e0f0':
Remove section about USB driver as not everything is directly available anymore
Merge commit '51851f307936a96bbb12acf98cf96979d5ed05bf'
* commit '51851f307936a96bbb12acf98cf96979d5ed05bf':
Fix make_windows_sdk to make sure we're not creating
Merge commit '0dbf4c8bcfc95bc09cca46e523094c3be9ab0d48'
* commit '0dbf4c8bcfc95bc09cca46e523094c3be9ab0d48':
Change scripts to support x86_64 for DDMS.
Merge commit '1f4a1dcb5f9cfe65a98be2fcb21cd5df4c6a3a9e'
* commit '1f4a1dcb5f9cfe65a98be2fcb21cd5df4c6a3a9e':
SDK #1800921: Packages the Windows SDK in a temporary location.
This changes make_windows_sdk so that it packages everything
in a temp dir. Once the build & packaging succeeds, the final
Zip is copied to the desired location.
The temp dir is *not* cleared on zip errors, which helps in
diagnosing packaging issues after the fact.
This has no impact on the build process itself (i.e. make
adb, emulator, etc.) which all happen in $SDK/out anyway.
The temp dir can be passed as an argument. If not provided,
the default Cygwin $TMP is used. Otherwise /tmp is used.
I also added an usage description when parameters are missing.
