Commit Graph

58 Commits

Author SHA1 Message Date
Raphael
31d15b9f76 Merge 48023786cf: 'Generate SDK Repository XML.' Do not merge.
When the "sdk_repo" modified is used during the SDK build,
this also generates the repository.xml and addon.xml files
for the new SDK repository packages and places them in
the DIST_DIR.

Example usage:
  make -j 16 PRODUCT-sdk-sdk showcommands sdk_repo dist DIST_DIR=/dist/sdk
  make -j 16 PRODUCT-google_sdk-sdk_addon showcommands sdk_repo dist DIST_DIR=/dist/addon

Also merges 3ea87ca65f
  'Fix XMLNS detection in SDK Repo XSD files.'
  to prevent a merge conflict later on.

Change-Id: Ib14fe820dab7a60bb5412968c146c30ec5ba81c7
2011-03-25 17:50:38 -07:00
Raphael
922ee89a69 Merge 2ff496b8a1: 'Build SDK repository.' Do not merge.
When the build is invoked with the fake target "sdk_repo" and
a main target of sdk, win_sdk or sdk_addon, we now create
packages in DIST_DIR that can directly be used to populate the
SDK Repository.
This is quite close to how we actually distribute the SDK.

Change-Id: I671e8ff1bc2a6e9f5c097241d65da1cfdde21154
2011-03-24 13:07:30 -07:00
Ying Wang
1a6a849bcb Disable ccache when use mingw.
Change-Id: Ieff363f9c4433bba53d1e94a25477c60933666e2
2011-03-10 18:25:51 -08:00
Raphael
1adaa57108 unix2dos command, used by win SDK, has been renamed under Lucid.
Note: this fix was already in master.

Change-Id: I7935093ef4a01181f7239e9aeeef4792ee0b54cc
2011-01-27 14:00:21 -08:00
Raphael
cca5d187d5 GB SDK: don't use HV2.bat when generating tools.
That's because GB uses the Tools_r& which do not have
hierarchyviewer2 so we should not try to pull the .bat from
hv2. We don't care since we'll ignore these old tools anyway
when packaging the final SDK.

Change-Id: Ie7d161bad59d6e919613db2e854f48964e59c4a9
2010-10-14 11:25:01 -07:00
Raphael
59b02d0eff Update win_sdk to put binaries in SDK/platform-tools.
Change-Id: I8fe9df75ceaf04aa1935341e51bf6f3edffae9e4
2010-10-08 15:41:01 -07:00
Xavier Ducrohet
76afc004df Integrate sdk.atree changes from master. DO NOT MERGE
- Move adb to the platform-tools.
- Update the windows build for it.
- Split the tools component from sdk.atre into sdk/build/tools.atree

Change-Id: I75608f12d6e1d8bc0f470e3ca26c7e550cfdcbd6
2010-09-30 11:33:21 -07:00
Raphael
0e4dd61849 Makefile to create Windows SDK under Linux.
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)
2010-04-23 13:16:16 -07:00
Raphael
84f621775e Fix make_windows_sdk when invoked without params.
Change-Id: I24a6e06498a343a31c562e0c765f6e8075b1916e
2010-03-06 14:50:50 -08:00
Raphael
080ecbe59a Fix make_windows_sdk.
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.
2010-03-01 14:47:22 -08:00
Raphael
6d32277b86 SDK Manager: post install script to update SDK Setup.exe
SDK Bug: 2404830

Change-Id: I7e2346c95132ff6d26468d589212bf83e15ce407
2010-01-28 20:13:15 -08:00
Raphael
d51d36fa54 Windows SDK: package new tools/find_java.bat
SDK Bug: 2315813

Change-Id: Ice0eb6327b153fcaab42477cd4d3aa8ee12e0063
2010-01-26 16:14:55 -08:00
Raphael
d670431064 Add etc1tool to Windows SDK.
SDK BUG 2368918

This depends on Change I1b4f5e39 from build/core.

Change-Id: I8348514506742aa70cdee057e94069a67357a689
2010-01-12 11:16:08 -08:00
Xavier Ducrohet
19cb54ea7d Remove components that were moved to sdk.git and update build scripts. 2009-11-17 15:17:25 -08:00
Raphael
62437b9984 Windows SDK: copy SDK Setup.exe at root of SDK.
Also add a source.properties (we'll install it on the vendor/google
script part of the script).

SDK BUG 2173135

Change-Id: Icb0f22a65ffd819bf7b0f48adbec51cbc1243f71
2009-10-14 07:21:26 -07:00
Raphael
40d4b03ee5 Fix Windows SDK build broken by layoutopt change.
Change-Id: I1503487861ef20dead3de62548feea6328e0d60d
2009-10-06 16:43:05 -07:00
Romain Guy
9d489ddff9 Add layoutopt to the SDK.
Change-Id: Idc9b152e2a5abffaa9feb2cf70791d8288cfa1dd
2009-10-05 19:38:40 -07:00
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