Commit Graph

79 Commits

Author SHA1 Message Date
Raphael
b2d8f0ee4e am 31d15b9f: Merge 48023786cf: \'Generate SDK Repository XML.\' Do not merge.
* commit '31d15b9f7616ac5605a895ad8fbc3117f0ff4475':
  Merge 48023786cf: 'Generate SDK Repository XML.' Do not merge.
2011-03-31 16:34:25 -07:00
Raphael
d739e3ab11 am 922ee89a: Merge 2ff496b8a1: \'Build SDK repository.\' Do not merge.
* commit '922ee89a69da7c3007b48977835e9736766b4ba2':
  Merge 2ff496b8a1: 'Build SDK repository.' Do not merge.
2011-03-31 16:34:18 -07:00
Raphael
06f2189a4e am 627afeae: resolved conflicts for merge of 002acfc3 to stage-korg-master
* commit '627afeae86cf877b53316d976f53c3735414f3ca':
  Fix XMLNS detection in SDK Repo XSD files.
2011-03-25 17:51:57 -07:00
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
627afeae86 resolved conflicts for merge of 002acfc3 to stage-korg-master
Change-Id: I58e9828bd4d3ebcc4099c9f9ab97390023a1b8e8
2011-03-25 17:38:23 -07:00
Raphael
3ea87ca65f Fix XMLNS detection in SDK Repo XSD files.
Change-Id: I7e804c1d7de2db9428d53242c146e15f4c2fcc15
2011-03-25 14:25:03 -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
Raphael
56c341295a 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

Change-Id: I4f60d3197cac8c22027534cb7686de087ddf1a90
2011-03-24 11:20:16 -07:00
Raphael
9eec951059 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: I1c4a120616697383792d7fb1b328cfcefac0b2f5
2011-03-24 11:09:43 -07:00
Ying Wang
ff3d4bc42b resolved conflicts for merge of 1a6a849b to gingerbread-plus-aosp
Change-Id: I05bf91403b3160ff6db7b9a60b3c1c5f1ded0c5b
2011-03-11 12:59:56 -08:00
Ying Wang
1a6a849bcb Disable ccache when use mingw.
Change-Id: Ieff363f9c4433bba53d1e94a25477c60933666e2
2011-03-10 18:25:51 -08:00
Raphael
ad402d2b1f resolved conflicts for merge of d30ec22e to gingerbread-plus-aosp
Change-Id: I02a991cfb35d3cd14bd45eee1c3454e5a9c4600b
2011-02-03 11:30:41 -08:00
Raphael
27caad9905 am 343c626a: am b0e81c37: Merge "SDK: Strip llvm-rs-cc in Windows SDK."
* commit '343c626adaaf323f13d3d0796cf4c84455496a96':
  SDK: Strip llvm-rs-cc in Windows SDK.
2011-02-03 09:05:11 -08:00
Raphael
cedf2ba818 SDK: fix win-sdk build errors, make future errors fatal.
Firs this fixes a cp/rm errors that were logged when building the Windows SDK.
There errors happens because the secondary sdk/tools/patch_windows_sdk.sh
was run twice.

Next the shell script is changed to make any error fatal and actually
break the build, like it should.

In the makefile, merge Ying's fix to correctly pass showcommands.

Change-Id: I97bbe46d705c6683e31bb701222efe6f9da71d70
2011-02-02 11:35:41 -08:00
Raphael
d38c76bdf0 SDK: Strip llvm-rs-cc in Windows SDK.
SDK Bug: 3394374

Change-Id: I46ca70a674da28f265f977a267f81039afe3de7c
2011-02-02 11:35:24 -08:00
Raphael
6a691b3ed8 resolved conflicts for merge of 1adaa571 to gingerbread-plus-aosp
Change-Id: I6c2ea537a9f6dce3c5d54b8c3c720b49058fea68
2011-01-27 21:46:19 -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 Moll
1fe58f3892 Win SDK: Split the win-sdk makefile and script into 2 parts.
The main makefile+scripts to build the Windows SDK is still this
one here in development/build/tools. However it defers to a new
matching set of files in sdk/build to build and package
things that depend on the sdk.git or external/qemu.git.

This will make it easier for us to prepare SDKs based on
a tools_rN branch that isn't cut at the same time than the
platform branch.

This is a multi-part changeset. The other part is in sdk.git.

This change also definitely removes support for building
the Windows SDK under Cygwin. Only building a specific subset
of individual binaries is supported at this point.

Change-Id: I4e9a2d810cf29fae0097fbd92be0cef89c9b3505
2010-11-22 21:12:44 -08:00
Raphael Moll
f4320c6b14 SDK Windows: Package customized proguard.bat scripts.
Requires Change: Ic1dc74cb3ff4dec9b419e2753290c361dffce48e
in platform/sdk.

Change-Id: Ieb2e308c0e9e655b2c047554563d753ac4cbb852
2010-10-25 14:41:16 -07:00
Raphael Moll
b04a4f947c Tools package was missing proguard.bat
SDK Bug: 3126278

Change-Id: I8bb9c2e2250b0da4303b09cdfe05717cee887c44
2010-10-23 22:11:37 -07: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
Bill Napier
85c3f8e126 Add in MonkeyRunner to the Windows SDK.
Change-Id: Iecb23b5a2f790978246df9ab4a10cda884abf742
2010-10-10 13:34:38 -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 Moll
2f613967a0 Move adb to the platform-tools (windows SDK part).
This is the Win SDK counterpart to Change I4c2a11c1.

Change-Id: I660ba49154894b5e78d7e943258ed769efd393dc
2010-09-27 16:20:07 -07:00
Xavier Ducrohet
420b59fe21 Fix windows SDK build.
Location of hierarchyviewer is now in hierarchyviewer2/app/etc

Change-Id: I14257c96552a16d19461cdf8194045a608dd03b3
2010-08-27 19:30:38 -07:00
Raphael Moll
f08d230ed0 SDK: Rename "SDK Setup.exe" to "SDK Manager.exe"
Change-Id: Id85ec31d80fc12a6907d9c3404a29d28d4923abd
2010-08-23 13:38:02 -07:00
Raphael Moll
ff779c0f2a 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
2010-08-05 13:32:03 -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