OSDN Git Service
Scott Main [Fri, 27 May 2011 17:54:50 +0000 (10:54 -0700)]
am
e02449dc: am
44c32b95: Merge "docs: adjust sdk page to show/hide messages based on whether online or offline docs mutually dependent on Change-Id: Ie7490973001530098d5001d9ef5e4dbfab86ed08" into honeycomb-mr2
* commit '
e02449dc9f02459d077c99a72033c7653be634bb':
docs: adjust sdk page to show/hide messages based on whether online or offline docs mutually dependent on Change-Id: Ie7490973001530098d5001d9ef5e4dbfab86ed08
Scott Main [Fri, 27 May 2011 17:23:09 +0000 (10:23 -0700)]
am
44c32b95: Merge "docs: adjust sdk page to show/hide messages based on whether online or offline docs mutually dependent on Change-Id: Ie7490973001530098d5001d9ef5e4dbfab86ed08" into honeycomb-mr2
* commit '
44c32b95f50f1190955a07dfece801875894d0bf':
docs: adjust sdk page to show/hide messages based on whether online or offline docs mutually dependent on Change-Id: Ie7490973001530098d5001d9ef5e4dbfab86ed08
Scott Main [Fri, 27 May 2011 17:18:14 +0000 (10:18 -0700)]
Merge "docs: adjust sdk page to show/hide messages based on whether online or offline docs mutually dependent on Change-Id: Ie7490973001530098d5001d9ef5e4dbfab86ed08" into honeycomb-mr2
Scott Main [Fri, 27 May 2011 16:52:19 +0000 (09:52 -0700)]
docs: adjust sdk page to show/hide messages based on whether online or offline docs
mutually dependent on Change-Id: Ie7490973001530098d5001d9ef5e4dbfab86ed08
Change-Id: I15658c0868c755947207cb8d6391b6aed4c90e14
Ying Wang [Thu, 26 May 2011 23:31:42 +0000 (16:31 -0700)]
am
4cd9e2d9: am
06e2f72b: Support to run dex-preopt on prebuilt apks.
* commit '
4cd9e2d99090502ced431b7abbff94bcc2176745':
Support to run dex-preopt on prebuilt apks.
Ying Wang [Thu, 26 May 2011 23:14:32 +0000 (16:14 -0700)]
am
06e2f72b: Support to run dex-preopt on prebuilt apks.
* commit '
06e2f72bc9e0f3fdbeaa9d4b00ac6fca7e0c4a7c':
Support to run dex-preopt on prebuilt apks.
Ying Wang [Thu, 26 May 2011 22:59:56 +0000 (15:59 -0700)]
Support to run dex-preopt on prebuilt apks.
Change-Id: Ic7c40c502934d7588166f26bbb6e2f235d1efdea
Jean-Baptiste Queru [Thu, 19 May 2011 21:30:26 +0000 (14:30 -0700)]
Merge
5d66a07d - do not merge
Change-Id: I787a6d5d5c79e7122ed506cd6d9e373e7d1049f4
Jean-Baptiste Queru [Thu, 19 May 2011 20:57:00 +0000 (13:57 -0700)]
Merge "Use actual numbers in version numbers."
Scott Main [Mon, 16 May 2011 19:22:27 +0000 (12:22 -0700)]
am
8d29d2dc: am
9d27a153: am
faf8baaf: docs: make featured video titles smaller so they don\'t line wrap
* commit '
8d29d2dc670cc990fa6824fdd7ba25edb2a479f2':
docs: make featured video titles smaller so they don't line wrap
Scott Main [Mon, 16 May 2011 19:19:13 +0000 (12:19 -0700)]
am
9d27a153: am
faf8baaf: docs: make featured video titles smaller so they don\'t line wrap
* commit '
9d27a153f714a312f844a35a0140e3fb1752f4e8':
docs: make featured video titles smaller so they don't line wrap
Scott Main [Mon, 16 May 2011 19:17:20 +0000 (12:17 -0700)]
am
faf8baaf: docs: make featured video titles smaller so they don\'t line wrap
* commit '
faf8baaff126aec214608acb9107c20066e0cb00':
docs: make featured video titles smaller so they don't line wrap
Scott Main [Mon, 16 May 2011 19:12:58 +0000 (12:12 -0700)]
docs: make featured video titles smaller so they don't line wrap
Change-Id: I5f4dc06e467a30b579c2710ac1d96a350ef77ff2
Jean-Baptiste Queru [Thu, 12 May 2011 15:52:59 +0000 (08:52 -0700)]
am
5372220a: Merge "Remove simulator from the lunch menu"
* commit '
5372220a1a12a715ca1242dcc3f4b11b89a8387a':
Remove simulator from the lunch menu
Jean-Baptiste Queru [Thu, 12 May 2011 15:04:50 +0000 (08:04 -0700)]
Merge "Remove simulator from the lunch menu"
Dianne Hackborn [Wed, 11 May 2011 20:49:50 +0000 (13:49 -0700)]
am
ea4d9f55: am
22b5d621: DO NOT MERGE. We are now dev branch for Honeycomb MR2.
* commit '
ea4d9f557b20e7a4ef77e6ac0c573cf3a9a5fd3a':
DO NOT MERGE. We are now dev branch for Honeycomb MR2.
Dianne Hackborn [Wed, 11 May 2011 20:35:36 +0000 (13:35 -0700)]
am
22b5d621: DO NOT MERGE. We are now dev branch for Honeycomb MR2.
* commit '
22b5d62172f1563a2513dea314c037703cddf217':
DO NOT MERGE. We are now dev branch for Honeycomb MR2.
Jean-Baptiste Queru [Wed, 11 May 2011 17:40:43 +0000 (10:40 -0700)]
Remove simulator from the lunch menu
Change-Id: I0d73b4722ce5126b64538ca7add2e55cd561c022
Jean-Baptiste Queru [Tue, 10 May 2011 15:29:49 +0000 (08:29 -0700)]
Use actual numbers in version numbers.
This string is used in the browser user agent, and some
sites get confused when this isn't a dotted-number version
number into thinking that they should serve stripped down HTML.
This clears the confusion.
Change-Id: I6c959ff17c540a1f3808f19238b9eb93ba170d2e
Dianne Hackborn [Tue, 10 May 2011 01:21:14 +0000 (18:21 -0700)]
DO NOT MERGE. We are now dev branch for Honeycomb MR2.
Change-Id: Icde20a70a35fc28e168eba4809c1c011ac5265b4
David Turner [Tue, 26 Apr 2011 17:24:24 +0000 (10:24 -0700)]
am
6f9b7562: am
d5565942: Merge "x86: Disable stack-protector until bionic is fixed"
* commit '
6f9b7562e36483a7bf23833d99da6a50e57f7266':
x86: Disable stack-protector until bionic is fixed
David 'Digit' Turner [Tue, 26 Apr 2011 17:24:22 +0000 (10:24 -0700)]
am
55a461c9: am
f245dd79: Merge "full_x86-eng: Ensure we copy the PC bios files."
* commit '
55a461c9b1ab92bf6250650afcacc8de85c1e01a':
full_x86-eng: Ensure we copy the PC bios files.
David Turner [Tue, 26 Apr 2011 08:12:03 +0000 (01:12 -0700)]
am
d5565942: Merge "x86: Disable stack-protector until bionic is fixed"
* commit '
d5565942437e2c0787822604921d034e9df5fc5d':
x86: Disable stack-protector until bionic is fixed
David 'Digit' Turner [Tue, 26 Apr 2011 07:36:59 +0000 (00:36 -0700)]
am
f245dd79: Merge "full_x86-eng: Ensure we copy the PC bios files."
* commit '
f245dd7975abedcb35e30aca1b1e6e3eb273388d':
full_x86-eng: Ensure we copy the PC bios files.
David Turner [Tue, 26 Apr 2011 06:35:09 +0000 (23:35 -0700)]
Merge "x86: Disable stack-protector until bionic is fixed"
David 'Digit' Turner [Tue, 26 Apr 2011 06:25:37 +0000 (23:25 -0700)]
Merge "full_x86-eng: Ensure we copy the PC bios files."
Raphael Moll [Sat, 16 Apr 2011 00:28:36 +0000 (17:28 -0700)]
am
cb6a22f5: am
2e4e3c94: Merge "Allow swtmenubar module to be buildable on Windows."
* commit '
cb6a22f591d66443c923ad917f6d40e943b476ce':
Allow swtmenubar module to be buildable on Windows.
Raphael [Sat, 16 Apr 2011 00:13:44 +0000 (17:13 -0700)]
resolved conflicts for merge of
854354be to honeycomb-plus-aosp
Change-Id: Iabd1ac0b63276067b094939b237c6e695fff0c9f
Raphael Moll [Fri, 15 Apr 2011 21:56:41 +0000 (14:56 -0700)]
am
2e4e3c94: Merge "Allow swtmenubar module to be buildable on Windows."
* commit '
2e4e3c94211fd31962e8fd1c6152932bbfdea7d5':
Allow swtmenubar module to be buildable on Windows.
Raphael Moll [Fri, 15 Apr 2011 21:56:39 +0000 (14:56 -0700)]
am
531c0c33: Merge "Add swtmenubar.jar to SDK"
* commit '
531c0c33a598632118c5bb5491f5d5295c607b18':
Add swtmenubar.jar to SDK
Raphael Moll [Fri, 15 Apr 2011 21:42:09 +0000 (14:42 -0700)]
Merge "Allow swtmenubar module to be buildable on Windows."
Raphael Moll [Fri, 15 Apr 2011 21:42:05 +0000 (14:42 -0700)]
Merge "Add swtmenubar.jar to SDK"
Raphael Moll [Fri, 15 Apr 2011 04:19:10 +0000 (21:19 -0700)]
Allow swtmenubar module to be buildable on Windows.
Change-Id: Ia20b8dea44f79df77ba0cb0479b99af990dc5b7b
Raphael Moll [Thu, 14 Apr 2011 06:49:21 +0000 (23:49 -0700)]
Add swtmenubar.jar to SDK
Change-Id: Ia46337875cb78bb6a01731008b9acbfa4657d0a9
Ying Wang [Thu, 14 Apr 2011 17:39:13 +0000 (10:39 -0700)]
resolved conflicts for merge of
8c425a9d to honeycomb-plus-aosp
Change-Id: I5a1045daa1f80d6e6493435e4297363face7dd96
Ying Wang [Thu, 14 Apr 2011 17:17:34 +0000 (10:17 -0700)]
am
479ec682: Merge "Fix "argument list too long""
* commit '
479ec68292c7ba17ab8e3d849cc1f186847f5cc5':
Fix "argument list too long"
Ying Wang [Thu, 14 Apr 2011 17:07:38 +0000 (10:07 -0700)]
Merge "Fix "argument list too long""
Ying Wang [Thu, 27 May 2010 18:55:39 +0000 (11:55 -0700)]
Fix "argument list too long"
Bug http://b/issue?id=
2718472
Change-Id: I936e660f87ec5cfbbf95e6580bade624b277228c
David 'Digit' Turner [Thu, 14 Apr 2011 15:34:40 +0000 (17:34 +0200)]
full_x86-eng: Ensure we copy the PC bios files.
This change ensures that building full_x86-eng will copy the
Bios files to the right location. This is necessary to launch
"emulator-x86" after building the system images.
Before this patch, one had to make the copy manually. Note that
sdk_x86-eng does not need this (the files are actually taken care
of in build/target/product/sdk.mk so will be copied even in case
of the ARM sdk build).
Change-Id: If70adead27c7997694ebc30561005d26a7358c34
Ying Wang [Wed, 13 Apr 2011 17:31:50 +0000 (10:31 -0700)]
am
7c1a1247: Drop using vendor/google/etc/apns-conf.xml for eng builds.
* commit '
7c1a1247f3e7110a95696671e8f71334e9b3c1b5':
Drop using vendor/google/etc/apns-conf.xml for eng builds.
Ying Wang [Tue, 22 Mar 2011 22:32:52 +0000 (15:32 -0700)]
Drop using vendor/google/etc/apns-conf.xml for eng builds.
Bug:
4133493
Change-Id: I3eee2a5658620f480370d260b395e928bc395886
Ying Wang [Tue, 12 Apr 2011 20:14:10 +0000 (13:14 -0700)]
resolved conflicts for merge of
4d9a8556 to honeycomb-plus-aosp
Change-Id: I3914339049e3d302f8542d8ea305905eec480bbb
Ying Wang [Mon, 11 Apr 2011 22:35:17 +0000 (15:35 -0700)]
am
e442c136: Merge "Add NDK crtbegin_so.o and crtend_so.o if they exist."
* commit '
e442c1361a9066d7a394c080273d5f93d77979e4':
Add NDK crtbegin_so.o and crtend_so.o if they exist.
Ying Wang [Mon, 11 Apr 2011 17:14:51 +0000 (10:14 -0700)]
Merge "Add NDK crtbegin_so.o and crtend_so.o if they exist."
Ying Wang [Fri, 8 Apr 2011 21:57:36 +0000 (14:57 -0700)]
Add NDK crtbegin_so.o and crtend_so.o if they exist.
Change-Id: Ic088a986d3810a1d313df30361145a467ba07e06
Scott Main [Fri, 1 Apr 2011 23:25:04 +0000 (16:25 -0700)]
am
2218c027: am
63e2c1eb: docs: add Google IO 2011 logo
* commit '
2218c027117b10fd909083c8c666bebb074c2167':
docs: add Google IO 2011 logo
Scott Main [Fri, 1 Apr 2011 23:19:26 +0000 (16:19 -0700)]
am
63e2c1eb: docs: add Google IO 2011 logo
* commit '
63e2c1eba8079caa3288a14041239f7b5018ee92':
docs: add Google IO 2011 logo
Scott Main [Fri, 1 Apr 2011 22:05:12 +0000 (15:05 -0700)]
docs: add Google IO 2011 logo
Change-Id: I0393325205c31f588d1e1fb64dfcc2d4714bdad6
Bruce Beare [Fri, 1 Apr 2011 16:09:02 +0000 (09:09 -0700)]
x86: Disable stack-protector until bionic is fixed
Change-Id: I2862de5c1b02490197704f4578a8a91d0565eef0
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Ying Wang [Fri, 1 Apr 2011 01:05:37 +0000 (18:05 -0700)]
resolved conflicts for merge of
fdc3192e to honeycomb-plus-aosp
Change-Id: Idddf7afb063109654664ecac252cf6be73125c20
Ying Wang [Fri, 1 Apr 2011 00:00:13 +0000 (17:00 -0700)]
resolved conflicts for merge of
bd0c91c8 to gingerbread-plus-aosp
Change-Id: Ia4d8719337f84927f96a162b97df8a8bc62630e1
Ying Wang [Thu, 31 Mar 2011 22:14:32 +0000 (15:14 -0700)]
am
54aa74ef: am
a9e5bb8a: am
f78fb1d1: Merge "Use my-dir in a consistent way as others"
* commit '
54aa74ef5da0a76a0fc1afdabaa24d2fb0744cd1':
Use my-dir in a consistent way as others
Ying Wang [Thu, 31 Mar 2011 22:11:58 +0000 (15:11 -0700)]
am
a9e5bb8a: am
f78fb1d1: Merge "Use my-dir in a consistent way as others"
* commit '
a9e5bb8a6b2b772b07214e4dd0004f6989285dd0':
Use my-dir in a consistent way as others
Ying Wang [Thu, 31 Mar 2011 22:10:33 +0000 (15:10 -0700)]
am
f78fb1d1: Merge "Use my-dir in a consistent way as others"
* commit '
f78fb1d1516e1d7448871ad3a2a403b12ff25f1a':
Use my-dir in a consistent way as others
Ying Wang [Thu, 31 Mar 2011 22:08:50 +0000 (15:08 -0700)]
am
15fcee57: am
c5e45492: am
4c401b1a: Merge "Fix argument handling in runhat() function"
* commit '
15fcee57aa124c6f690eccab580502ed78e3746b':
Fix argument handling in runhat() function
Ying Wang [Thu, 31 Mar 2011 22:01:53 +0000 (15:01 -0700)]
am
c5e45492: am
4c401b1a: Merge "Fix argument handling in runhat() function"
* commit '
c5e45492fad4c5e45c1d5f0726c25877a601338e':
Fix argument handling in runhat() function
Ying Wang [Thu, 31 Mar 2011 21:58:23 +0000 (14:58 -0700)]
am
4c401b1a: Merge "Fix argument handling in runhat() function"
* commit '
4c401b1aabf5ad09c152d5e308bb13124c0a2d24':
Fix argument handling in runhat() function
Ying Wang [Thu, 31 Mar 2011 21:54:56 +0000 (14:54 -0700)]
Merge "Use my-dir in a consistent way as others"
Ying Wang [Thu, 31 Mar 2011 21:54:24 +0000 (14:54 -0700)]
Merge "Fix argument handling in runhat() function"
Chris Dearman [Wed, 16 Feb 2011 20:16:09 +0000 (12:16 -0800)]
Fix argument handling in runhat() function
Change-Id: I22fa264a3db516dcbe0cc9109dc20d6c004d3418
Signed-off-by: Raghu Gandham <raghu@mips.com>
David 'Digit' Turner [Wed, 30 Mar 2011 16:40:55 +0000 (09:40 -0700)]
am
dc620647: am
c09cc904: am
dffd4058: Merge "build speedup: Do not use shell \'find\' function to look for NOTICE files."
* commit '
dc620647ef6c22b55b6de4992104f44c5f1c406c':
build speedup: Do not use shell 'find' function to look for NOTICE files.
Raphael [Wed, 30 Mar 2011 15:19:36 +0000 (08:19 -0700)]
am
a5b8a040: (-s ours) am
f0f1490d: am
57c70196: (-s ours) Merge "Merge
c4d4731b4dd306b74b9e2245b4983b6b3c5b866e: \'Build SDK repository\'. Do not merge."
* commit '
a5b8a040867edb54a3512579750dca0dd9898500':
Merge
c4d4731b4dd306b74b9e2245b4983b6b3c5b866e: 'Build SDK repository'. Do not merge.
David 'Digit' Turner [Wed, 30 Mar 2011 13:32:43 +0000 (06:32 -0700)]
am
c09cc904: am
dffd4058: Merge "build speedup: Do not use shell \'find\' function to look for NOTICE files."
* commit '
c09cc904f183907111de57581d55c181df8ef47f':
build speedup: Do not use shell 'find' function to look for NOTICE files.
David 'Digit' Turner [Wed, 30 Mar 2011 13:25:22 +0000 (06:25 -0700)]
am
dffd4058: Merge "build speedup: Do not use shell \'find\' function to look for NOTICE files."
* commit '
dffd40587aff00c6852d64f5d7ed20d588bb993e':
build speedup: Do not use shell 'find' function to look for NOTICE files.
David 'Digit' Turner [Wed, 30 Mar 2011 13:17:39 +0000 (06:17 -0700)]
Merge "build speedup: Do not use shell 'find' function to look for NOTICE files."
Raphael [Tue, 29 Mar 2011 22:57:29 +0000 (15:57 -0700)]
resolved conflicts for merge of
f761d642 to honeycomb-plus-aosp
Change-Id: Id0096682cbabd0d34f5d6b0a0151577d9140ea7d
Ying Wang [Tue, 29 Mar 2011 20:18:25 +0000 (13:18 -0700)]
am
7c7fbeaf: am
7bbea4b5: Disable dexpreopt for unbundled build.
* commit '
7c7fbeaf1a034c9cdc4c7c86eb84cf183a1b6728':
Disable dexpreopt for unbundled build.
Ying Wang [Tue, 29 Mar 2011 20:18:22 +0000 (13:18 -0700)]
am
bef90c0e: am
3fd580d4: Fix dependency of prebuilt target non-static Java libraries.
* commit '
bef90c0ec0fa638e5d2ef0a721e3b3c5e3d9d7f1':
Fix dependency of prebuilt target non-static Java libraries.
Raphael [Tue, 29 Mar 2011 20:07:51 +0000 (13:07 -0700)]
Merge "resolved conflicts for merge of
8c2d872a to honeycomb-plus-aosp" into honeycomb-plus-aosp
Ying Wang [Tue, 29 Mar 2011 19:56:03 +0000 (12:56 -0700)]
am
fcf00d53: Support to build renderscript in unbundled apps.
* commit '
fcf00d53bfdfa18fab0873be2d4d2800c621f861':
Support to build renderscript in unbundled apps.
Raphael [Tue, 29 Mar 2011 19:53:33 +0000 (12:53 -0700)]
resolved conflicts for merge of
8c2d872a to honeycomb-plus-aosp
Change-Id: Ied7d5ccb947094ea7f3334ee052eed39ee315a48
Ying Wang [Tue, 29 Mar 2011 18:47:12 +0000 (11:47 -0700)]
Support to build renderscript in unbundled apps.
Change-Id: I8104be723f507df4f9673616bada11fb613651b7
David 'Digit' Turner [Tue, 29 Mar 2011 12:27:27 +0000 (14:27 +0200)]
build speedup: Do not use shell 'find' function to look for NOTICE files.
The GNU Make wildcard function can be used to look for a specific file and
is _much_ faster than invoking the find command through $(shell ...).
Since notice_files.mk is included by base_rules.mk for each and every module
in the build tree, this represents a considerable speed-up. For example, when
building the full-eng product from the AOSP tree, the no-op "make" goes from
21 seconds to 16 seconds with this patch applied.
Change-Id: Ideb1bb74d5bfbb650834fa4b6e151ff24dcd0150
David 'Digit' Turner [Tue, 29 Mar 2011 00:41:22 +0000 (17:41 -0700)]
am
440d7e1e: am
9fe6dc2c: Merge "Support target-specific sdk/build/tools.atree extension."
* commit '
440d7e1e5bb732ff8638af40e112e1df98e1f537':
Support target-specific sdk/build/tools.atree extension.
Raphael [Fri, 25 Mar 2011 22:13:55 +0000 (15:13 -0700)]
resolved conflicts for merge of
db0d59d1 to honeycomb-plus-aosp
Change-Id: Ie3f5b2986bc926407a7883b449441cb58ab70e30
Raphael [Fri, 25 Mar 2011 05:43:55 +0000 (22:43 -0700)]
Raphael [Fri, 25 Mar 2011 05:39:23 +0000 (22:39 -0700)]
am
57c70196: (-s ours) Merge "Merge
c4d4731b4dd306b74b9e2245b4983b6b3c5b866e: \'Build SDK repository\'. Do not merge."
* commit '
57c7019693a07c7b9e200d4560a0886d248bfe5b':
Merge
c4d4731b4dd306b74b9e2245b4983b6b3c5b866e: 'Build SDK repository'. Do not merge.
Raphael [Fri, 25 Mar 2011 05:23:24 +0000 (22:23 -0700)]
Merge "Merge
c4d4731b4dd306b74b9e2245b4983b6b3c5b866e: 'Build SDK repository'. Do not merge."
Brett Chabot [Fri, 25 Mar 2011 02:35:08 +0000 (19:35 -0700)]
am
775c2912: Merge "Add more sdk lib tests to sdk build."
* commit '
775c291292716095ce7610a050e459e7b8d4d4d6':
Add more sdk lib tests to sdk build.
Brett Chabot [Fri, 25 Mar 2011 02:05:35 +0000 (19:05 -0700)]
am
50a06fe3: am
dd8edfdb: Manual cherry pick of build more sdklib tests.
* commit '
50a06fe30e17acdb9a20c3c58f869d59d8c1b563':
Manual cherry pick of build more sdklib tests.
Brett Chabot [Fri, 25 Mar 2011 02:02:44 +0000 (19:02 -0700)]
am
dd8edfdb: Manual cherry pick of build more sdklib tests.
* commit '
dd8edfdb1ebdc5717357564fe42586d090e2bbe0':
Manual cherry pick of build more sdklib tests.
Brett Chabot [Fri, 25 Mar 2011 01:57:29 +0000 (18:57 -0700)]
Merge "Add more sdk lib tests to sdk build."
Raphael [Wed, 16 Feb 2011 00:09:36 +0000 (16:09 -0800)]
Merge
c4d4731b4dd306b74b9e2245b4983b6b3c5b866e: '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: I863ac8baf159432d7c95df46cba6e4f3b9122629
Brett Chabot [Thu, 24 Mar 2011 05:23:27 +0000 (22:23 -0700)]
Manual cherry pick of build more sdklib tests.
Original description from open master:
-----------
Add more sdk lib tests to sdk build.
Also fix whitespace issues introduced by last commit.
Change-Id: Ifdede823b99b210ad6a48513e8522b4f660537cf
Raphael [Wed, 16 Feb 2011 00:09:36 +0000 (16:09 -0800)]
Merge
c4d4731b4dd306b74b9e2245b4983b6b3c5b866e: '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: Id08a3a55a564938dbeb6e3dd170d4a9a7153ae6e
Raphael Moll [Thu, 24 Mar 2011 17:22:53 +0000 (10:22 -0700)]
Raphael Moll [Thu, 24 Mar 2011 17:04:06 +0000 (10:04 -0700)]
Raphael Moll [Thu, 24 Mar 2011 16:54:38 +0000 (09:54 -0700)]
Merge "Merge
960ad4e0952da55943591098ea74827de921d303 from master_open." into honeycomb
Ying Wang [Thu, 24 Mar 2011 10:36:19 +0000 (03:36 -0700)]
am
7bbea4b5: Disable dexpreopt for unbundled build.
* commit '
7bbea4b5c1f053cbe428025e9f9dec0e50bcc551':
Disable dexpreopt for unbundled build.
Ying Wang [Thu, 24 Mar 2011 10:36:11 +0000 (03:36 -0700)]
am
3fd580d4: Fix dependency of prebuilt target non-static Java libraries.
* commit '
3fd580d4e29657b812d3ab3c459487689a5f2da6':
Fix dependency of prebuilt target non-static Java libraries.
Brett Chabot [Thu, 24 Mar 2011 05:23:27 +0000 (22:23 -0700)]
Add more sdk lib tests to sdk build.
Also fix whitespace issues introduced by last commit.
Change-Id: I579abcd5f8bc743ee7fa0206307af9347e7352dc
Brett Chabot [Thu, 24 Mar 2011 05:21:04 +0000 (22:21 -0700)]
am
deab07f3: am
d42aadb1: Add ddmlib-tests.jar to sdk build.
* commit '
deab07f31b673481ef92c6044835b579be5e2483':
Add ddmlib-tests.jar to sdk build.
Brett Chabot [Thu, 24 Mar 2011 05:18:26 +0000 (22:18 -0700)]
am
d42aadb1: Add ddmlib-tests.jar to sdk build.
* commit '
d42aadb1ebbc1aef1551b4aa4c525ef54cd5433d':
Add ddmlib-tests.jar to sdk build.
Brett Chabot [Wed, 23 Mar 2011 03:38:57 +0000 (20:38 -0700)]
Add ddmlib-tests.jar to sdk build.
Change-Id: Ib681389a1f1e2ead30808cef3c74dd5da9dea4d0
Brett Chabot [Thu, 24 Mar 2011 03:00:31 +0000 (20:00 -0700)]
am
327d133f: Merge "Add ddmlib-tests.jar to sdk build."
* commit '
327d133fce8928f1474c52a07447679e1e76ffa0':
Add ddmlib-tests.jar to sdk build.
Brett Chabot [Thu, 24 Mar 2011 02:22:25 +0000 (19:22 -0700)]
Merge "Add ddmlib-tests.jar to sdk build."
Bruce Beare [Wed, 2 Mar 2011 16:29:59 +0000 (08:29 -0800)]
Merge
960ad4e0952da55943591098ea74827de921d303 from master_open.
Original commit msg:
sdk: Add pc-bios files for IA qemu emulator
Change-Id: I7f66a192975dc201a5f886e6a5e02b0ca9fbdee0
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Ying Wang [Wed, 12 Jan 2011 19:12:06 +0000 (11:12 -0800)]
Disable dexpreopt for unbundled build.
Cherry-picked from Honeycomb.
Change-Id: I1b8bf7faa3974f389a1f105b3397c4ceeea68885
David Turner [Wed, 23 Mar 2011 21:05:58 +0000 (14:05 -0700)]
am
86ed1dba: am
75724826: Merge "sdk: Add pc-bios files for IA qemu emulator"
* commit '
86ed1dbaa74e1c5b21f98dbb74f2b600a9025470':
sdk: Add pc-bios files for IA qemu emulator
Ying Wang [Tue, 1 Feb 2011 20:57:45 +0000 (12:57 -0800)]
Fix dependency of prebuilt target non-static Java libraries.
Cherry-picked from Honeycomb to fix a dependency issue when building
prebuilt shared library.
Change-Id: I0a9cd3835b50dcc130a5f211e89d6bd22478fd42
OSDN Git Service
