Commit Graph

215 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
David Turner
4621d1a82c am 18ddf41d: Merge "Add x86 qemu"
* commit '18ddf41d5d11729c58fbbfbe0f22e7c5888a1751':
  Add x86 qemu
2011-03-22 06:10:31 -07:00
Bruce Beare
60f5414658 Add x86 qemu
Change-Id: Ic0bfcacd5834f9c2345d7fc0c45528da321f0f7f
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Author: Jun Nakajima <jun.nakajima@intel.com>
2011-03-22 14:02:45 +01: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
Jack Palevich
2fd4288383 am 5e38995f: Merge "Add BasicGLSurfaceView sample." into gingerbread
* commit '5e38995f6af6339e5dccf86b50f8b658917c7aeb':
  Add BasicGLSurfaceView sample.
2011-01-17 17:42:56 -08:00
Jack Palevich
2f6e41d664 Add BasicGLSurfaceView sample.
Show how to get started with OpenGL ES 2.0.

Change-Id: I22e5e72114fd76bb7319c51e0a3b0d0e05c546fb
2011-01-14 19:27:56 -08:00
Xavier Ducrohet
daf0b895e8 Cherry-pick f0e5e933 from master.
Move emulator skins to development.git

Also added new default RAM config to the skins.

Change-Id: I520c485f4ef9f6d9d2eea126ed46d96b5fc3e785
2011-01-07 13:03:22 -08:00
Xavier Ducrohet
12cd9bacfb am dde7492d: Merge "Move emulator skins to development.git"
* commit 'dde7492d4b34ba810329ad080a078bfb870a4507':
  Move emulator skins to development.git
2011-01-06 17:35:01 -08:00
Xavier Ducrohet
f0e5e93307 Move emulator skins to development.git
Also added new default RAM config to the skins.

Change-Id: Ib786287b43f639c6ae80bf109ac4fe5b12635676
2011-01-06 13:31:24 -08:00
Raphael Moll
40812f1c4b am 1bf9f693: Merge "Use OUT_DIR in atree to find android.jar"
* commit '1bf9f6936e423a686b623752e9f008acefaa1057':
  Use OUT_DIR in atree to find android.jar
2011-01-05 15:48:26 -08:00
Raphael Moll
c2e8083255 Use OUT_DIR in atree to find android.jar
Depends on change Iabbe9053 from build/core.

Change-Id: I0b6e29a5282c2ca6ff329981e5f8d2c677e6e84b
2011-01-05 14:59:27 -08:00
Dirk Dougherty
49b989c36a am 4171f296: Add AcceleromerPlay sample app to SDK samples package
* commit '4171f296681a0ef0a1df21fdc792fc9997c1146b':
  Add AcceleromerPlay sample app to SDK samples package
2010-11-29 18:13:49 -08:00
Dirk Dougherty
4171f29668 Add AcceleromerPlay sample app to SDK samples package
Change-Id: Id7ae8de4f3543169d6d707a470f0b872e00e953f
2010-11-29 18:11:26 -08:00
Dirk Dougherty
fb381e9ff5 am c73f37ba: Remove HeavyWeight sample from SDK samples package.
* commit 'c73f37ba5790cd1fe588d0f5886b677a7eaa39f0':
  Remove HeavyWeight sample from SDK samples package.
2010-11-29 17:07:26 -08:00
Dirk Dougherty
c73f37ba57 Remove HeavyWeight sample from SDK samples package.
Change-Id: Id2113b8a0cd1a7cc3d807919e6c40c50917baaea
2010-11-29 17:03:46 -08:00
Roman Nurik
624ae678ef am 14789d1e: Merge "Add NFCDemo to sdk.atree" into gingerbread
* commit '14789d1eab905728da4f6995816c80716caf52f4':
  Add NFCDemo to sdk.atree
2010-11-29 15:54:07 -08:00
Roman Nurik
9488e4296e Add NFCDemo to sdk.atree
Change-Id: I2e0a330a31d6d3c0b8c70c38af60118461e7e403
2010-11-29 15:45:50 -08:00
Raphael
a65f76962f resolved conflicts for merge of f0f624f3 to gingerbread-plus-aosp
Change-Id: I670002d7f8606f22c438057883e1a4a9fe63ebf6
2010-11-23 15:36:17 -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
Alexander Lucas
655f02a456 am 48cc36d9: Merge "Added SIP Demo to sample apps." into gingerbread
* commit '48cc36d936ea132665c35a1f8c9a2b4b9207ec0b':
  Added SIP Demo to sample apps.
2010-11-03 15:35:24 -07:00
Alexander Lucas
a025796211 Added SIP Demo to sample apps.
Change-Id: Id98b6e542e1be5b9822a696936e735406c08500f
2010-11-03 13:21:52 -07:00
Raphael Moll
07d29555ee am 42197997: Merge "SDK Windows: Package customized proguard.bat scripts." 2010-10-26 15:42:14 -07:00
Raphael Moll
5c428f4a8d am 799754e1: Merge "Tools package was missing proguard.bat"
Merge commit '799754e18b7ce057a9aab8ea243f7dfd1d4edb44' into gingerbread-plus-aosp

* commit '799754e18b7ce057a9aab8ea243f7dfd1d4edb44':
  Tools package was missing proguard.bat
2010-10-25 16:57:55 -07: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
Bill Napier
1e41661b60 am 66d61ef9: Merge "Add in MonkeyRunner to the Windows SDK."
Merge commit '66d61ef95f5a0f8abc8b5371409e3c5372c9e10a' into gingerbread-plus-aosp

* commit '66d61ef95f5a0f8abc8b5371409e3c5372c9e10a':
  Add in MonkeyRunner to the Windows SDK.
2010-10-15 15:58:17 -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
Xavier Ducrohet
9e914e4aa2 Reorder the samples packaging + readme.
Change-Id: Ic4d91b214ec9ceb6303bd99e0a0580fbf3401177
2010-10-13 13:38:45 -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
Xavier Ducrohet
682ec29335 Split the tools component from sdk.atree
This is now in sdk/build/tools.atree.

Change-Id: Ic0c5e14e22a5c760b686dee1a7e376667b9c651b
2010-09-28 08:37:24 -07:00
Xavier Ducrohet
64e53fe5dd Merge "Move adb to the platform-tools." 2010-09-27 16:24:25 -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
6a8e50f695 Move adb to the platform-tools.
Also fixed the packaging of hierarchyViewer in the SDK

Change-Id: I4c2a11c1d87867efdd5df2dcb90469b7b1c5065a
2010-09-27 13:58:45 -07:00