Commit Graph

337 Commits

Author SHA1 Message Date
Raphael
e2d5577e86 am 4cc9a1e9: Merge 48023786cf: \'Generate SDK Repository XML.\' Do not merge.
* commit '4cc9a1e942f068c86b0715e398ec40f86a9deb87':
  Merge 48023786cf: 'Generate SDK Repository XML.' Do not merge.
2011-03-28 12:56:11 -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
4cc9a1e942 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: Ic9832e71456d76f849406e641792f4285ffbf649
2011-03-25 17:45:21 -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
David Turner
44b79c9579 am 411f741d: am 4621d1a8: am 18ddf41d: Merge "Add x86 qemu"
* commit '411f741d905a174a7f9e315efe7fe7e31f55589b':
  Add x86 qemu
2011-03-25 16:39:03 -07:00
David Turner
411f741d90 am 4621d1a8: am 18ddf41d: Merge "Add x86 qemu"
* commit '4621d1a82ce5bb3196c82cb164e7b56521f3a7d2':
  Add x86 qemu
2011-03-25 15:51:22 -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
Raphael
48023786cf Generate SDK Repository XML.
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: Ibaad66f4b1cc476a4146afde7087a10a0557f74c
2011-03-18 13:35:03 -07:00
Xavier Ducrohet
d73e1584d5 Add android-support-v4.jar to the apidemo samples in the SDK package.
Change-Id: I07a9723152ffc4f08bbfd254e886986ec0429509
2011-03-17 12:10:10 -07:00
Xavier Ducrohet
07815cd01d Remove the pre-made notice file from platform-tools.
A change in build.git now puts the one that's automatically
generated.

Change-Id: Idced9ea6176152400189203b84809c9a5a3fd92e
2011-03-15 13:29:38 -07:00
Ying Wang
b0948c5a6e am b058af05: Disable ccache when using mingw.
* commit 'b058af052efa1dccf38eef8993008920088ff188':
  Disable ccache when using mingw.
2011-03-11 14:11:11 -08:00
Ying Wang
b058af052e Disable ccache when using mingw.
Change-Id: I40ec9f6dfbf54b362b8a87cde7774b396b46b063
2011-03-11 13:59:34 -08: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
Ying Wang
d46eaa6f76 Add android-support-v4.jar to sdk.
Change-Id: I28d2a323d31df6b405548e0c73c616eb7b69753d
2011-03-01 17:14:05 -08:00
Xavier Ducrohet
7aa1c11e67 Fix SDK build.
Change-Id: I214048d331c0c9d3885983e588e9313dd3722346
2011-03-01 14:20:35 -08:00
Xavier Ducrohet
e488b3ef67 Put back jar file into compatibility package.
Change-Id: I437d3ba7b6fae13815e34a741adadac8e6ecd8f1
2011-03-01 12:07:04 -08:00
Xavier Ducrohet
51920ee661 Fix build by using $(DIST_DIR)
Change-Id: I68832ee411fcafa171354c8b06b0992c8f01cd4d
2011-03-01 11:10:02 -08:00
Xavier Ducrohet
62df672f5d Package compatibility component.
Change-Id: I4324df1814ae9450b254b22c7bd1b28e4826a29b
2011-02-28 15:57:39 -08:00
Alex Sakhartchouk
005148359f Merge "Moving renderscript sdk samples to their correct location." 2011-02-28 09:02:51 -08:00
Alex Sakhartchouk
e430471134 Moving renderscript sdk samples to their correct location.
Change-Id: I27de909cf0dbd91319c0eefebd0184ecc5c12dc9
2011-02-22 11:41:40 -08:00
Raphael
2ff496b8a1 Build SDK repository.
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: I01c729eff4dbc1eccbc7c5b1869f329363f1ce07
2011-02-16 20:25:43 -08:00
Raphael
f9b583bf03 Win SDK: remove test of llvm-rs-cc presence.
This removes the test that makes the SDK only strip llvm-rs-cc.exe if present.
It means the SDK will FAIL if llvm-rs-cc wasn't build successfully for Windows.

Change-Id: I4c73954c30265e71e84916976f16ae76d67a8e13
2011-02-14 13:01:17 -08:00
Winson Chung
e412a0f4a9 Adding sample for collection widgets backed by content providers.
Change-Id: If0005d88a19dfa05ddd7c60aba1a1d7d742158be
2011-02-11 14:50:06 -08:00
Alex Sakhartchouk
be64691c98 Adding renderscript samples.
Change-Id: I9aecae9aa554c5fdc6a4843e80509d54eac5bebe
2011-02-09 09:10:06 -08:00
Roman Nurik
f4f345d0b7 Major update to HoneycombGallery
* Add action bar and icon theming
* Add contextual action bar and photo sharing
* Add notifications (with large icons too)
* Add fullscreening (lights-out mode)
* Add a picture frame

Change-Id: I07a1da435d5adc7bc76c7ac2cc087ff2efd74156
2011-02-07 17:03:19 -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
7a508aed2a 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: Iee75e42b0b0bbba3c26858c82c933660dc6d74ae
2011-02-02 11:52:53 -08:00
Raphael
0e2de35b07 SDK: Strip llvm-rs-cc in Windows SDK.
SDK Bug: 3394374

Change-Id: I892afdde0672bd5803d25c99e202f2b0418b796d
2011-02-02 11:52:47 -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
Xavier Ducrohet
75b7bb2521 Add Clang includes to the SDK for Renderscript
Change-Id: I247f5c1480799868792871ea68c7765fbbc01fa6
2011-01-31 16:37:33 -08:00
Jean-Baptiste Queru
ce2fdae0e6 Merge 1adaa571 from gingerbread
Change-Id: Ic4be80eea5331f2b32b507dd6546b86383306f94
2011-01-29 11:13:54 -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
Alexander Lucas
9f935c7da5 Added Honeycomb Gallery sample application.
Change-Id: I1eefc2837016a7973544f0c57a8464466e7dcef9
2011-01-19 17:02:48 -08:00
Xavier Ducrohet
91946fe86a Merge "Add RenderScript samples to the SDK." into honeycomb 2011-01-18 18:13:34 -08:00
Xavier Ducrohet
3292919d70 Add RenderScript samples to the SDK.
Change-Id: I6139a792916a1cb942c05be8243d52784f39f859
2011-01-18 16:41:29 -08:00
Xavier Ducrohet
7a3e7b1b9a Update sdk.prop for the platform SDK component.
sdk.properties should be stored in development.git and
not sdk.git so move it here.

Change-Id: I32e166927ea91cad36d66bb14e90cb36ccb3bc82
2011-01-18 14:21:55 -08:00
Jack Palevich
ebb6bc2fc8 Add BasicGLSurfaceView sample.
Show how to get started with OpenGL ES 2.0.

Change-Id: Iee83ca6a52eee64e8c6b77bc9a8abff11a1eabfd
2011-01-17 17:48:44 -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
Xavier Ducrohet
a67b557e13 Merge "Add RS includes to the SDK and update skin list." into honeycomb 2011-01-16 19:16:16 -08:00
Winson Chung
eb80909dfc Adding WidgetPreview utility.
Change-Id: Idfdf866400687e58304863c3c4f3dd3c4aed45b1
2011-01-16 17:13:16 -08:00