Commit Graph

41 Commits

Author SHA1 Message Date
Raphael
eec015ad14 am 8fccf9eb: mgwz.dll must be packaged next to tools/zipalign.exe in the Windows SDK.
Merge commit '8fccf9eb7c099a42729d0ff4a8a250f73a68c3f9' into eclair

* commit '8fccf9eb7c099a42729d0ff4a8a250f73a68c3f9':
  mgwz.dll must be packaged next to tools/zipalign.exe in the Windows SDK.
2009-08-20 21:46:18 -07:00
Raphael
8fccf9eb7c mgwz.dll must be packaged next to tools/zipalign.exe in the Windows SDK.
BUG 2068812
2009-08-20 21:12:01 -07:00
Raphael
a501e44af0 am 64c277c2: Merge change 20833 into donut
Merge commit '64c277c24bf52762e36185cc769d1b29233e20d4'

* commit '64c277c24bf52762e36185cc769d1b29233e20d4':
  BUG 1993354 : Add zipalign to SDK
2009-08-12 12:04:50 -07:00
Raphael
69b2b48e07 am a901c3d4: Merge change 20765 into donut
Merge commit 'a901c3d41203e6cbbf5cd72722fcf78f5919feff'

* commit 'a901c3d41203e6cbbf5cd72722fcf78f5919feff':
  BUG 2033924: Add AdbWinUsbApi.dll to prebuilt for Windows SDK
2009-08-11 18:12:30 -07:00
Raphael
f6abec3376 BUG 1993354 : Add zipalign to SDK 2009-08-11 15:37:00 -07:00
Raphael
1620a180c2 BUG 2033924: Add AdbWinUsbApi.dll to prebuilt for Windows SDK 2009-08-11 11:47:30 -07:00
Raphael
ca76255aba am 1736f2ce: Merge change 20484 into donut
Merge commit '1736f2ce6560a89acc8c21d573da96d76b75ec07'

* commit '1736f2ce6560a89acc8c21d573da96d76b75ec07':
  BUG 2039647 : support customization from calling wrapper script.
2009-08-07 16:03:02 -07:00
Raphael
bd7dfac5a5 BUG 2039647 : support customization from calling wrapper script. 2009-08-07 15:44:33 -07:00
Xavier Ducrohet
bb90a717f2 am 5379e098: Remove section about USB driver as not everything is directly available anymore
Merge commit '5379e0981ebd570faba0dcd13c087f71d856e0f0'

* commit '5379e0981ebd570faba0dcd13c087f71d856e0f0':
  Remove section about USB driver as not everything is directly available anymore
2009-07-30 16:07:37 -07:00
Xavier Ducrohet
5379e0981e Remove section about USB driver as not everything is directly available anymore
See development/host/windows/usb/readme.txt
2009-07-30 14:51:37 -07:00
Android (Google) Code Review
6b1e19d17d am 51851f30: Merge change 3316 into donut
Merge commit '51851f307936a96bbb12acf98cf96979d5ed05bf'

* commit '51851f307936a96bbb12acf98cf96979d5ed05bf':
  Fix make_windows_sdk to make sure we're not creating
2009-06-05 21:16:51 -07:00
Raphael
fb64322e76 Fix make_windows_sdk to make sure we're not creating
files as directories :-)
2009-06-05 12:10:48 -07:00
Raphael
9aa9fcf0c1 am 0dbf4c8b: Change scripts to support x86_64 for DDMS.
Merge commit '0dbf4c8bcfc95bc09cca46e523094c3be9ab0d48'

* commit '0dbf4c8bcfc95bc09cca46e523094c3be9ab0d48':
  Change scripts to support x86_64 for DDMS.
2009-06-05 00:29:53 -07:00
Raphael
0dbf4c8bcf Change scripts to support x86_64 for DDMS. 2009-06-04 16:58:55 -07:00
Android (Google) Code Review
d7a547d116 am 1f4a1dcb: Merge change 2121 into donut
Merge commit '1f4a1dcb5f9cfe65a98be2fcb21cd5df4c6a3a9e'

* commit '1f4a1dcb5f9cfe65a98be2fcb21cd5df4c6a3a9e':
  SDK #1800921: Packages the Windows SDK in a temporary location.
2009-05-20 22:44:27 -07:00
Raphael
d1959dcee1 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.
2009-05-20 22:28:21 -07:00
Raphael Moll
6542544f0e Merge branch 'readonly-p4-master' 2009-04-20 13:25:19 -07:00
Raphael Moll
4394c9b060 AI 146972: am: CL 146970 am: CL 146969 Windows SDK fixes for JetCreator
Original author: raphael
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 146972
2009-04-20 13:23:51 -07:00
Raphael Moll
4cdf12c33e AI 146970: am: CL 146969 Windows SDK fixes for JetCreator
Original author: raphael
  Merged from: //branches/cupcake/...

Automated import of CL 146970
2009-04-20 13:22:55 -07:00
Xavier Ducrohet
fe0f6b73ab Merge branch 'readonly-p4-master' 2009-04-20 11:03:34 -07:00
Xavier Ducrohet
82ac685f65 AI 146949: am: CL 146944 am: CL 146943 Move JetCreator into tools/Jet/JetCreator. Add demo content and Logic templates in tools/Jet/
Original author: xav
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 146949
2009-04-20 11:02:00 -07:00
Xavier Ducrohet
1a2b2f08e2 AI 146944: am: CL 146943 Move JetCreator into tools/Jet/JetCreator. Add demo content and Logic templates in tools/Jet/
Original author: xav
  Merged from: //branches/cupcake/...

Automated import of CL 146944
2009-04-20 11:01:18 -07:00
Raphael Moll
3328f02351 Merge branch 'readonly-p4-master' 2009-04-19 09:45:08 -07:00
Raphael Moll
9ddd8a3d73 AI 146864: am: CL 146863 am: CL 146862 Fix Windows SDK build.
Original author: raphael
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 146864
2009-04-19 09:43:12 -07:00
Raphael Moll
00e25d419c AI 146863: am: CL 146862 Fix Windows SDK build.
Original author: raphael
  Merged from: //branches/cupcake/...

Automated import of CL 146863
2009-04-19 09:42:01 -07:00
Xavier Ducrohet
78aeb4ef40 Merge branch 'readonly-p4-master' 2009-04-18 22:56:42 -07:00
Xavier Ducrohet
afb3dbd5c0 AI 146831: am: CL 146750 am: CL 146747 Add the JetCreator tools and docs to the SDK (mac/windows only).
Original author: xav
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 146831
2009-04-18 22:55:28 -07:00
Xavier Ducrohet
2e82cdc301 AI 146750: am: CL 146747 Add the JetCreator tools and docs to the SDK (mac/windows only).
Original author: xav
  Merged from: //branches/cupcake/...

Automated import of CL 146750
2009-04-17 11:41:48 -07:00
The Android Open Source Project
e68ddeeb13 Merge commit 'goog/readonly-p4-master' 2009-03-31 21:34:24 -07:00
Raphael Moll
dc9a9a7bf7 AI 143880: am: CL 143879 am: CL 143876 Include hprof-conv in SDK (bug #1640225)
Original author: raphael
  Merged from: //branches/cupcake/...
  Original author: android-build
  Merged from: //branches/donutburger/...

Automated import of CL 143880
2009-03-31 17:20:54 -07:00
Raphael Moll
3ae1236bc9 AI 143879: am: CL 143876 Include hprof-conv in SDK (bug #1640225)
Original author: raphael
  Merged from: //branches/cupcake/...

Automated import of CL 143879
2009-03-31 17:19:15 -07:00
Jean-Baptiste Queru
3e2a2d312a Merge commit 'remotes/korg/cupcake' into cupcake_to_master 2009-03-18 16:57:28 -07:00
The Android Open Source Project
52d4c30ca5 auto import from //depot/cupcake/@135843 2009-03-03 19:29:09 -08:00
The Android Open Source Project
d4aee0c0ca auto import from //depot/cupcake/@135843 2009-03-03 18:28:16 -08:00
The Android Open Source Project
d2f2b1d7b7 auto import from //depot/cupcake/@132589 2009-03-03 14:03:58 -08:00
The Android Open Source Project
b8747bc7b1 auto import from //depot/cupcake/@137055 2009-03-02 22:54:20 -08:00
The Android Open Source Project
ff4b5f241f auto import from //branches/cupcake/...@132276 2009-02-19 10:57:29 -08:00
Adrian Taylor
a1a69d0936 Improving comments in make_windows_sdk.sh.
This commit adds notes about some cygwin packages which I found were
required, and a few other things which cropped up. It has no functional
changes.

List of packages amended as per request by Raphael Moll
(ralf@android.com).
2009-02-13 10:08:31 +00:00
The Android Open Source Project
7b53e39377 auto import from //branches/cupcake/...@127101 2009-01-20 14:03:55 -08:00
The Android Open Source Project
b8d704a517 auto import from //branches/cupcake/...@126645 2009-01-15 16:12:07 -08:00
The Android Open Source Project
e943f2fd8e Code drop from //branches/cupcake/...@124589 2008-12-17 18:04:04 -08:00