OSDN Git Service
The Android Open Source Project [Tue, 8 Jun 2010 20:14:16 +0000 (13:14 -0700)]
merge from open-source master
Change-Id: I2169fb30a5bfe48501745b2141e82ad9e25971aa
Jean-Baptiste Queru [Tue, 8 Jun 2010 17:06:47 +0000 (10:06 -0700)]
Merge "Build BUILD_MULTI_PREBUILT for the prebuilt target"
The Android Open Source Project [Fri, 4 Jun 2010 14:56:24 +0000 (07:56 -0700)]
merge from open-source master
Change-Id: Id3161ac44e0eaba0184b3d2d4af43e4e40d26e90
Jeff Hamilton [Wed, 26 May 2010 23:13:54 +0000 (18:13 -0500)]
Build host tools as 32bit on all Darwin machines.
Change-Id: I121b388056e68b787518c66a01c172bc4ffaef9b
Ying Wang [Wed, 2 Jun 2010 21:37:28 +0000 (14:37 -0700)]
am
ba16a89d: Override LOCAL_CERTIFICATE in inherit-package.
Merge commit '
ba16a89dbd61003a3b907d0f5e8fc48fba2afcab' into froyo-plus-aosp
* commit '
ba16a89dbd61003a3b907d0f5e8fc48fba2afcab':
Override LOCAL_CERTIFICATE in inherit-package.
Ying Wang [Wed, 2 Jun 2010 20:24:36 +0000 (13:24 -0700)]
Override LOCAL_CERTIFICATE in inherit-package.
it's to fix typo.
Change-Id: I9a791faa4b7b5967b5d23bfcb4caeebaef94e723
Ying Wang [Wed, 2 Jun 2010 20:09:12 +0000 (13:09 -0700)]
am
52911309: Cherry-pick unbundled build changes from master
Merge commit '
529113098350c026ec521258d4c6fba51f285a48' into froyo-plus-aosp
* commit '
529113098350c026ec521258d4c6fba51f285a48':
Cherry-pick unbundled build changes from master
Ying Wang [Wed, 26 May 2010 20:13:56 +0000 (13:13 -0700)]
Cherry-pick unbundled build changes from master
Change-Id: I82cab32f00b7b729d9b01c8e1532c8bf0ad2fb92
Xavier Ducrohet [Wed, 26 May 2010 00:49:24 +0000 (17:49 -0700)]
am
8e5605a7: Add QuickSearchBox to the SDK build.
Merge commit '
8e5605a774fd2f61c6d5bae0440b20fc0bdd79f7' into froyo-plus-aosp
* commit '
8e5605a774fd2f61c6d5bae0440b20fc0bdd79f7':
Add QuickSearchBox to the SDK build.
Xavier Ducrohet [Wed, 26 May 2010 00:03:07 +0000 (17:03 -0700)]
Add QuickSearchBox to the SDK build.
Change-Id: Ia0cc7b4cd8245d368685d50cf32cd21875cbdbbf
Scott Main [Tue, 25 May 2010 19:31:29 +0000 (12:31 -0700)]
am
ca671ab7: Revert "Doc change: Update froyo mark for home"
Merge commit '
ca671ab7a661625e021f2145e2d01f39d542fb28' into froyo-plus-aosp
* commit '
ca671ab7a661625e021f2145e2d01f39d542fb28':
Revert "Doc change: Update froyo mark for home"
Scott Main [Tue, 25 May 2010 19:22:29 +0000 (12:22 -0700)]
Revert "Doc change: Update froyo mark for home"
This reverts commit
9d1d6441d97eeea80c70c549646d7c177936e148.
Dirk Dougherty [Thu, 20 May 2010 07:15:38 +0000 (00:15 -0700)]
am
e9b01eb4: Doc change: add tv assets for carousel.
Merge commit '
e9b01eb46d461e7cfecb365acf046e2ad56c05a0' into froyo-plus-aosp
* commit '
e9b01eb46d461e7cfecb365acf046e2ad56c05a0':
Doc change: add tv assets for carousel.
Dirk Dougherty [Wed, 19 May 2010 05:12:23 +0000 (22:12 -0700)]
Doc change: add tv assets for carousel.
Change-Id: I357509c83e64ceb898b2069482ff1d0f3b3337cc
Dirk Dougherty [Thu, 20 May 2010 01:58:05 +0000 (18:58 -0700)]
am
9d1d6441: Doc change: Update froyo mark for home
Merge commit '
9d1d6441d97eeea80c70c549646d7c177936e148' into froyo-plus-aosp
* commit '
9d1d6441d97eeea80c70c549646d7c177936e148':
Doc change: Update froyo mark for home
Dirk Dougherty [Thu, 20 May 2010 01:25:33 +0000 (18:25 -0700)]
Doc change: Update froyo mark for home
Change-Id: Idacecd87faca95cd258436ab842c03102e5fc6c6
The Android Open Source Project [Fri, 14 May 2010 22:52:40 +0000 (15:52 -0700)]
merge from open-source master
Change-Id: I0dd123dde8f0da42a99313cffed6a48d30e38381
Jean-Baptiste Queru [Fri, 14 May 2010 22:47:56 +0000 (15:47 -0700)]
Merge "Use a different kernel boot line for the disk installer."
Jean-Baptiste Queru [Fri, 14 May 2010 22:47:39 +0000 (15:47 -0700)]
Merge "Use a property to enable the eth0 LAN port on the emulator"
The Android Open Source Project [Fri, 14 May 2010 21:35:29 +0000 (14:35 -0700)]
merge from open-source master
Change-Id: I4ea9aa2765cb634382da92ff17f5af9e2f6b4078
Jean-Baptiste Queru [Fri, 14 May 2010 21:10:50 +0000 (14:10 -0700)]
Merge "Fix "make modules" script bug under Mac OS X."
The Android Open Source Project [Fri, 14 May 2010 20:38:55 +0000 (13:38 -0700)]
merge from open-source master
Change-Id: Ia4cb27645bfd757fb75273ff5a6cbf3af57b3a03
Jean-Baptiste Queru [Fri, 14 May 2010 19:21:31 +0000 (12:21 -0700)]
Merge "Updated to better distinguish between options and operands"
Jean-Baptiste Queru [Fri, 14 May 2010 19:17:43 +0000 (12:17 -0700)]
Merge "Support absolute path, in OUT_DIR"
Ravi K Yenduri [Sun, 14 Feb 2010 22:15:32 +0000 (16:15 -0600)]
Build BUILD_MULTI_PREBUILT for the prebuilt target
Add files included as prebuilts with "BUILD_MULTI_PREBUILT"
to be installed as part of the 'prebuilt' target.
Change-Id: I2fa2dfff2637701281ab78a523c58fc46577ab75
The Android Open Source Project [Mon, 10 May 2010 18:05:12 +0000 (11:05 -0700)]
merge from open-source master
Change-Id: Id99b6cbc613c6c7b9d1ef79274b1c28b808a32d4
Scott Main [Mon, 10 May 2010 17:26:20 +0000 (10:26 -0700)]
am
3494d9b3: docs: lighten the "new" red. softens the effect and makes it more legible when selected
Merge commit '
3494d9b3deeb9967be247bf31cdaa3fd30fb4207' into froyo-plus-aosp
* commit '
3494d9b3deeb9967be247bf31cdaa3fd30fb4207':
docs: lighten the "new" red. softens the effect and makes it more legible when selected
Scott Main [Mon, 10 May 2010 15:18:26 +0000 (08:18 -0700)]
docs: lighten the "new" red. softens the effect and makes it more legible when selected
Change-Id: I0f1f70c281cc0a6f3621c898b04d3845924f6e35
Scott Main [Mon, 10 May 2010 16:43:15 +0000 (09:43 -0700)]
am
3044d243: Merge "add froyo graphic for homepage and fix css bug" into froyo
Merge commit '
3044d243c99f46030521fce650add82db640046a' into froyo-plus-aosp
* commit '
3044d243c99f46030521fce650add82db640046a':
add froyo graphic for homepage and fix css bug
Jean-Baptiste Queru [Fri, 7 May 2010 19:53:45 +0000 (12:53 -0700)]
Merge "Replace arm with proper variable for CPU/ABI"
Bruce Beare [Fri, 7 May 2010 18:51:30 +0000 (11:51 -0700)]
Use a different kernel boot line for the disk installer.
Change-Id: I6b20386a24e1141bfe2a252b635243c235d46865
Scott Main [Fri, 7 May 2010 18:32:12 +0000 (11:32 -0700)]
Merge "add froyo graphic for homepage and fix css bug" into froyo
Dan Bornstein [Thu, 6 May 2010 23:12:06 +0000 (16:12 -0700)]
am
03fb96f0: Allow for a slightly larger libwebcore, add another library to the list, correct/update a couple entries, and add a couple more comments.
Merge commit '
03fb96f01eeed12ce5dc6dd8fa2e839ed497758e' into froyo-plus-aosp
* commit '
03fb96f01eeed12ce5dc6dd8fa2e839ed497758e':
Allow for a slightly larger libwebcore, add another library to the list,
Dan Bornstein [Thu, 6 May 2010 02:33:47 +0000 (19:33 -0700)]
Allow for a slightly larger libwebcore, add another library to the list,
correct/update a couple entries, and add a couple more comments.
Bug:
2651381
Change-Id: I9aaf48c3c2115b111794710bb4e959613bf22add
Scott Main [Thu, 6 May 2010 18:43:08 +0000 (11:43 -0700)]
add froyo graphic for homepage and fix css bug
Change-Id: Ie040686a6c7982233d72298403a88f794b6b26db
The Android Open Source Project [Wed, 5 May 2010 22:16:56 +0000 (15:16 -0700)]
merge from open-source master
Change-Id: Ie06ab3b2424480706c644f1a803a6e3de400f15d
Dan Bornstein [Wed, 5 May 2010 21:37:24 +0000 (14:37 -0700)]
am
3ca0e96a: Merge "Fixed a bunch of stuff in the prelink mappings file:" into froyo
Merge commit '
3ca0e96a3a66a6c53536bf7346f616e672e2c57a' into froyo-plus-aosp
* commit '
3ca0e96a3a66a6c53536bf7346f616e672e2c57a':
Fixed a bunch of stuff in the prelink mappings file:
Dan Bornstein [Wed, 5 May 2010 21:36:04 +0000 (14:36 -0700)]
Merge "Fixed a bunch of stuff in the prelink mappings file:" into froyo
Bruce Beare [Wed, 5 May 2010 16:47:16 +0000 (09:47 -0700)]
Replace arm with proper variable for CPU/ABI
Change-Id: If8594d9a2abf4d8c08b5ccea612bb700afa9e9b7
Bruce Beare [Tue, 4 May 2010 21:49:38 +0000 (14:49 -0700)]
Use a property to enable the eth0 LAN port on the emulator
Change-Id: I26f4ec7fac9b7a8ad3013914967cf0f8fdec91ff
Bruce Beare [Fri, 30 Apr 2010 19:48:32 +0000 (12:48 -0700)]
Add support for x86 VirtualBox Emulation
To make a VirtualBox install image,
make installer_img
Dan Bornstein [Mon, 3 May 2010 22:15:57 +0000 (15:15 -0700)]
Fixed a bunch of stuff in the prelink mappings file:
* Added mappings for most of the libraries that didn't already
have them (as observed from my build).
* Re-canonicalized all the offsets in the mappings file,
per the official policy of keeping things megabyte-aligned.
* Added comments on each line indicating what size the library
actually appeared to be in my build (to help with future rejiggerings).
* Added a bit of documentation about the whole deal.
Even with this change, I know there are other libraries that will
still need to be included, but I think what I have here is a good
step. Also, this change only reserves room for the new libraries, but
subsequent changes (in other subprojects) are required to actually
start prelinking the new libraries. Those changes will be forthcoming
as well.
Bug:
2651381
Change-Id: I7a06382fc2b8a14bbd3261de58df3f8a31e4108e
Scott Main [Wed, 5 May 2010 01:18:02 +0000 (18:18 -0700)]
am
74108dea: fix css bug for paragraphs in table cells - only select the direct descendant for p:last-child in a td
Merge commit '
74108deaf1747943a493751cbff9de321f1dd397' into froyo-plus-aosp
* commit '
74108deaf1747943a493751cbff9de321f1dd397':
fix css bug for paragraphs in table cells
Scott Main [Wed, 5 May 2010 00:24:26 +0000 (17:24 -0700)]
fix css bug for paragraphs in table cells
- only select the direct descendant for p:last-child in a td
Change-Id: I9ad63b80914fbfe4d3e74041915f67b7a08d9649
The Android Open Source Project [Mon, 3 May 2010 23:11:04 +0000 (16:11 -0700)]
merge from open-source master
Change-Id: I3d24628d38c99369f242733d9089d7c5669a4623
Jean-Baptiste Queru [Mon, 3 May 2010 16:52:03 +0000 (09:52 -0700)]
Adapt to new location of libcore
Change-Id: I316355751db621d318a78dc6e844d6bf2c7fdc87
Doug Zongker [Fri, 30 Apr 2010 21:24:34 +0000 (14:24 -0700)]
am
2ea21065: add metadata to OTA package in easily-parsed form
Merge commit '
2ea21065b66da9819df92b37a79f0f87552ee331' into froyo-plus-aosp
* commit '
2ea21065b66da9819df92b37a79f0f87552ee331':
add metadata to OTA package in easily-parsed form
Jean-Baptiste Queru [Fri, 30 Apr 2010 17:13:33 +0000 (10:13 -0700)]
Adapt to new location of libcore
Change-Id: Ibabfe907f00522c1966ddc333352eaea2bdcb5bd
Alexey Tarasov [Sat, 21 Nov 2009 03:41:06 +0000 (13:41 +1000)]
Make expr more POSIXy
Change-Id: I939cf1f227c14112656804d69c1afd7ead4a31ed
Jean-Baptiste Queru [Thu, 29 Apr 2010 14:16:36 +0000 (07:16 -0700)]
Merge "generic_x86 support"
Bruce Beare [Wed, 28 Apr 2010 21:12:52 +0000 (14:12 -0700)]
generic_x86 support
Add in Makefiles and support files for x86 builds
Based on changes by: wonjong.lee <wonjong.lee@windriver.com>
Additional changes by: Mark Gross <mark.gross@intel.com>
Additional changes by: Bruce Beare <brucex.j.beare@intel.com>
Change-Id: Id087411b282b1b68a0251e7f9cbbdde183549787
Signed-off-by: Bruce Beare <brucex.j.beare@intel.com>
Evan JIANG [Fri, 23 Jan 2009 16:11:30 +0000 (00:11 +0800)]
Fix "make modules" script bug under Mac OS X.
For Mac OS uses BSD sed, it doesn't support "\n". Then, "make modules"
command cannot work correctly under Mac OS. Using tr command to replace
sed command, it has the same behavior under both Mac OS and Linux.
Change-Id: I29e044cc66bf24f6459cbb33164fd9f55f772e3c
Doug Zongker [Wed, 28 Apr 2010 23:05:21 +0000 (16:05 -0700)]
add metadata to OTA package in easily-parsed form
This is only for use by the tools that manipulate OTA packages; it
doesn't touch device code.
Change-Id: I1e21b24b86340d8f86c9d15b2aeb79c461f75d18
The Android Open Source Project [Wed, 28 Apr 2010 22:55:08 +0000 (15:55 -0700)]
merge from open-source master
Change-Id: Ie49d1b19914fcfefedfdfc070800426d4b13dd46
Raphael Moll [Sun, 18 Apr 2010 07:07:37 +0000 (00:07 -0700)]
Remove obsolete machine-setup.html reference.
Bug 1231
Change-Id: I629361cf5dddc9d0fbf493e016f1aaf2a50b6935
Scott Main [Tue, 27 Apr 2010 21:28:12 +0000 (14:28 -0700)]
am
c3d808a7: Merge "support a few more header levels for sidebox so the sidebox can be placed at any level and be semantically correct" into froyo
Merge commit '
c3d808a727c2b42d48658e6fca06b1d4a9817f12' into froyo-plus-aosp
* commit '
c3d808a727c2b42d48658e6fca06b1d4a9817f12':
support a few more header levels for sidebox so the sidebox can
Scott Main [Tue, 27 Apr 2010 21:23:04 +0000 (14:23 -0700)]
Merge "support a few more header levels for sidebox so the sidebox can be placed at any level and be semantically correct" into froyo
Raphael [Sat, 24 Apr 2010 00:15:13 +0000 (17:15 -0700)]
am
9ca1628e: Support building Windows SDK under Linux.
Merge commit '
9ca1628e3f565607e1fdef71b570d3ddb5ec09df' into froyo-plus-aosp
* commit '
9ca1628e3f565607e1fdef71b570d3ddb5ec09df':
Support building Windows SDK under Linux.
Raphael [Sat, 24 Apr 2010 00:14:58 +0000 (17:14 -0700)]
am
4c70244c: Make zipalign build for the Win SDK under Linux.
Merge commit '
4c70244cb1af8b2babd7750c2bd19aeb722e19e0' into froyo-plus-aosp
* commit '
4c70244cb1af8b2babd7750c2bd19aeb722e19e0':
Make zipalign build for the Win SDK under Linux.
Raphael [Sat, 17 Apr 2010 00:50:09 +0000 (17:50 -0700)]
Support building Windows SDK under Linux.
- envsetup.mk & config.mk: we define a new BUILD_OS and a minimal set
of things like BUILD_OUT to be able to use some local tools when
doing cross-compilation. This allows us to use the Linux version of
ACP when cross-compiling the tools to Windows.
- Makfile: include windows_sdk.mk when needed to build a Windows SDK.
- main.mk: support a win_sdk target (e.g. PRODUCT-sdk-win_sdk)
(Merge master Change I9d08d0df)
Raphael [Wed, 14 Apr 2010 19:19:12 +0000 (12:19 -0700)]
Make zipalign build for the Win SDK under Linux.
(Merge master Change Ibd667437)
Scott Main [Fri, 23 Apr 2010 18:41:30 +0000 (11:41 -0700)]
support a few more header levels for sidebox so the sidebox can
be placed at any level and be semantically correct
Change-Id: I51b77e82a701e1898986698d3a58a1b8367ec5c6
Scott Main [Wed, 21 Apr 2010 00:33:03 +0000 (17:33 -0700)]
am
d72731d2: docs: misc css changes make sidebox size match qv make figure align with right margin remove margins from the last <p> in a table cell
Merge commit '
d72731d213269f63f2bb80631f02914800f556ad' into froyo-plus-aosp
* commit '
d72731d213269f63f2bb80631f02914800f556ad':
docs: misc css changes
Scott Main [Tue, 20 Apr 2010 22:38:17 +0000 (15:38 -0700)]
am
f655dab5: Merge "docs: add script to capture the ctrl+f key event (initiates \'find\' search on the page) and expand all inherited members." into froyo
Merge commit '
f655dab5e611d8e013f1e5ad4ddcb269f7db05a6' into froyo-plus-aosp
* commit '
f655dab5e611d8e013f1e5ad4ddcb269f7db05a6':
docs: add script to capture the ctrl+f key event (initiates 'find' search
Scott Main [Thu, 15 Apr 2010 23:34:41 +0000 (16:34 -0700)]
docs: misc css changes
make sidebox size match qv
make figure align with right margin
remove margins from the last <p> in a table cell
Change-Id: Ie655dac45728f782fb309f3c11c1b7ee56bc5660
Scott Main [Tue, 20 Apr 2010 22:34:22 +0000 (15:34 -0700)]
Merge "docs: add script to capture the ctrl+f key event (initiates 'find' search on the page) and expand all inherited members." into froyo
Roman Nurik [Mon, 19 Apr 2010 23:30:12 +0000 (16:30 -0700)]
Roman Nurik [Tue, 13 Apr 2010 23:23:42 +0000 (16:23 -0700)]
cherry-pick from master:
42092024ebd81896e741829c50f37a7e0095392e
Enable query highlighting and result ranking for search autocomplete on d.a.c. Also make it case-insensitive.
Change-Id: I3dd0e4edd7efae5a5758952699c08f1a46bdfeda
Brad Fitzpatrick [Mon, 19 Apr 2010 18:35:26 +0000 (11:35 -0700)]
am
135677a7: For userdebug builds, enable Dalvik lock contention sampling.
Merge commit '
135677a71800c27d7747b5c86712d05a74392f62' into froyo-plus-aosp
* commit '
135677a71800c27d7747b5c86712d05a74392f62':
For userdebug builds, enable Dalvik lock contention sampling.
Brad Fitzpatrick [Fri, 16 Apr 2010 23:55:41 +0000 (16:55 -0700)]
For userdebug builds, enable Dalvik lock contention sampling.
Change-Id: I75cca6fc0ac0d0adfc059a8f82b2f6ae584361f3
Scott Main [Fri, 16 Apr 2010 16:00:29 +0000 (09:00 -0700)]
docs: add script to capture the ctrl+f key event (initiates 'find' search
on the page) and expand all inherited members.
Also move the appropriate methods from -docs.js into -reference.js where
they belong and add some function documentation.
Change-Id: I421bbf27d3b41d377776b3d64a97380458fcebd6
Raphael Moll [Tue, 13 Apr 2010 17:38:35 +0000 (10:38 -0700)]
Fix "make layoutlib" under Windows+Cygwin
Change-Id: I5277afe77f1e3367ecfd0933a9ab14a5a42c2be2
Wu-cheng Li [Tue, 13 Apr 2010 16:20:18 +0000 (09:20 -0700)]
am
fcc7cf77: Fix the check of double quoted @see tag.
Merge commit '
fcc7cf779905613d6bd48344b5c3a994237c02bd' into froyo-plus-aosp
* commit '
fcc7cf779905613d6bd48344b5c3a994237c02bd':
Fix the check of double quoted @see tag.
Wu-cheng Li [Sun, 4 Apr 2010 09:14:23 +0000 (17:14 +0800)]
Fix the check of double quoted @see tag.
Originally \n was not discarded so a balanced quoted string still
has compile error.
bug:
2553570
Change-Id: I073c0c0ba370d55493d3ee6d17c7ebe9f42afe7a
Scott Main [Sat, 10 Apr 2010 18:40:08 +0000 (11:40 -0700)]
am
479f4a5c: Merge "cherry-pick from master: I615602a3d8f9970e36399b98dadb5e2f03638444 docs: various stylesheet changes indent tables revise figure class add caption classes for tables and images add styles for xml reference docs (used by resource types docs) tweak st
Merge commit '
479f4a5cc4db72024123d36145028fe557e72f98' into froyo-plus-aosp
* commit '
479f4a5cc4db72024123d36145028fe557e72f98':
cherry-pick from master: I615602a3d8f9970e36399b98dadb5e2f03638444
Scott Main [Sat, 10 Apr 2010 00:03:42 +0000 (17:03 -0700)]
Merge "cherry-pick from master: I615602a3d8f9970e36399b98dadb5e2f03638444 docs: various stylesheet changes indent tables revise figure class add caption classes for tables and images add styles for xml reference docs (used by resource types docs) tweak styles for the icon tables to eliminate obscure 'caption' class" into froyo
Xavier Ducrohet [Fri, 9 Apr 2010 05:38:52 +0000 (22:38 -0700)]
am
74134a50: Add camera sounds to the emulator system image build.
Merge commit '
74134a503fc908b28ad0ff87e1291698fbceb9cf' into froyo-plus-aosp
* commit '
74134a503fc908b28ad0ff87e1291698fbceb9cf':
Add camera sounds to the emulator system image build.
Xavier Ducrohet [Fri, 9 Apr 2010 01:07:27 +0000 (18:07 -0700)]
Add camera sounds to the emulator system image build.
Bug:
2538315
Change-Id: I30c477ecbe5f0c0a64ca7c3796e72642df0002bf
Scott Main [Mon, 29 Mar 2010 16:50:34 +0000 (09:50 -0700)]
cherry-pick from master: I615602a3d8f9970e36399b98dadb5e2f03638444
docs: various stylesheet changes
indent tables
revise figure class
add caption classes for tables and images
add styles for xml reference docs (used by resource types docs)
tweak styles for the icon tables to eliminate obscure 'caption' class
Change-Id: I23f53d884f39a5f6a4b45172186e0d1c7619da30
Daniel Sandler [Thu, 8 Apr 2010 23:59:27 +0000 (16:59 -0700)]
am
f96cb307: Merge "Add Protips to all builds." into froyo
Merge commit '
f96cb307e3c6d0eb08fd3e4a17d1d1af7c46d385' into froyo-plus-aosp
* commit '
f96cb307e3c6d0eb08fd3e4a17d1d1af7c46d385':
Add Protips to all builds.
Daniel Sandler [Thu, 8 Apr 2010 23:54:50 +0000 (16:54 -0700)]
Merge "Add Protips to all builds." into froyo
Dianne Hackborn [Wed, 7 Apr 2010 21:26:06 +0000 (14:26 -0700)]
am
303b3412: Add clean step for SDK version change.
Merge commit '
303b34121e0d331570bcb156b03251cca93a5631' into froyo-plus-aosp
* commit '
303b34121e0d331570bcb156b03251cca93a5631':
Add clean step for SDK version change.
Dianne Hackborn [Wed, 7 Apr 2010 21:13:47 +0000 (14:13 -0700)]
Add clean step for SDK version change.
Change-Id: I2ea85496af49572115dbbd9a98787b1fd54adc50
Daniel Sandler [Wed, 7 Apr 2010 20:48:47 +0000 (16:48 -0400)]
Add Protips to all builds.
Bug:
2559083
Change-Id: Ibd6333516a798f88e4d4ef08a6246812b1009a76
Dianne Hackborn [Tue, 6 Apr 2010 19:58:50 +0000 (12:58 -0700)]
am
efba0b98: It\'s beginning to look a lot like release time!
Merge commit '
efba0b9829ae375a7d7e2093dee707b79f1b8951' into froyo-plus-aosp
* commit '
efba0b9829ae375a7d7e2093dee707b79f1b8951':
It's beginning to look a lot like release time!
Dianne Hackborn [Mon, 5 Apr 2010 19:33:11 +0000 (12:33 -0700)]
It's beginning to look a lot like release time!
Everywhere we build...
Froyo is now Android 2.2, API 8.
This breaks the YouTube prebuilt (yay prebuilts!) but little else.
Does this mean we are becoming mature?
Change-Id: I15d228d57853a0dfabc47dda253d55339a5b3d17
Jean-Baptiste Queru [Tue, 30 Mar 2010 16:09:00 +0000 (09:09 -0700)]
Add extra IMEs in the full config
Bug:
2556582
Change-Id: I46de0d6d7755b169acaa7689de4ddadb0df9c41f
Xavier Ducrohet [Fri, 2 Apr 2010 00:43:12 +0000 (17:43 -0700)]
am
47c4bbe9: Package the proper vold config file in SDK system image.
Merge commit '
47c4bbe9ebdf58a0f1b3fe2ecd979a341ee072d2' into froyo-plus-aosp
* commit '
47c4bbe9ebdf58a0f1b3fe2ecd979a341ee072d2':
Package the proper vold config file in SDK system image.
Xavier Ducrohet [Thu, 1 Apr 2010 20:20:21 +0000 (13:20 -0700)]
Package the proper vold config file in SDK system image.
Change-Id: I7698c76d8d704837106450a32cba7b9c8f5b4446
Xavier Ducrohet [Thu, 1 Apr 2010 17:56:35 +0000 (10:56 -0700)]
am
04fd11d1: Merge "Add CarHome to the SDK." into froyo
Merge commit '
04fd11d11246e419473f38bdddf31329182ae0a6' into froyo-plus-aosp
* commit '
04fd11d11246e419473f38bdddf31329182ae0a6':
Add CarHome to the SDK.
Xavier Ducrohet [Thu, 1 Apr 2010 17:50:01 +0000 (10:50 -0700)]
Merge "Add CarHome to the SDK." into froyo
Ying Wang [Thu, 1 Apr 2010 06:17:45 +0000 (23:17 -0700)]
am
139e3324: Add symbols.zip and build.prop to sdk dist.
Merge commit '
139e33243bbe92858f39919c220a4d65fe8790bd' into froyo-plus-aosp
* commit '
139e33243bbe92858f39919c220a4d65fe8790bd':
Add symbols.zip and build.prop to sdk dist.
Ying Wang [Thu, 1 Apr 2010 00:29:04 +0000 (17:29 -0700)]
Add symbols.zip and build.prop to sdk dist.
Change-Id: I667f5ef847a6e8e78c6b3df5c2b092bb5d863955
http://b/issue?id=
2394164
The Android Open Source Project [Wed, 31 Mar 2010 21:00:21 +0000 (14:00 -0700)]
merge from open-source master
Change-Id: Ic4d166897b594c4d5552a2bb1a89ed368cf2b782
Ying Wang [Tue, 30 Mar 2010 23:42:15 +0000 (16:42 -0700)]
Add comments for ANDROID_BUILD_SHELL
Change-Id: I71f0a1a08b097cd179bbcb684a9114267f9bf0db
Ying Wang [Tue, 30 Mar 2010 19:55:13 +0000 (12:55 -0700)]
Allow use of alternative to bash as the build shell.
Change-Id: Ib92217f90c98e04a1d16efd4904d9d7ba9dda3cf
http://b/issue?id=
2557214
Xavier Ducrohet [Tue, 30 Mar 2010 18:42:55 +0000 (11:42 -0700)]
Add CarHome to the SDK.
Bug:
2526512
Change-Id: Ia4f127a4b5ac3bf52ff9664cfbca6fdbda3aa154
Dirk Dougherty [Tue, 9 Mar 2010 01:31:26 +0000 (17:31 -0800)]
cherry-pick
db00a226071878ae9bd821d28903dca8f6071140 to froyo.
Change-Id: I2ba25432014c7f04748cd6502d6ded997ef21f48
Dirk Dougherty [Wed, 3 Mar 2010 22:34:51 +0000 (14:34 -0800)]
cherry-pick
fe0104041858046a0aa649c791869d7eb1a5c175 to froyo.
Change-Id: I9c95ebc6f735cb6abc2b0920c2274e0b5ce0ef70
Jean-Baptiste Queru [Fri, 26 Mar 2010 18:22:03 +0000 (11:22 -0700)]
Add separate language packs, for extra flexibility.
This way, languages can be managed more carefully through
the inheritance chain.
Bug:
2546758
Change-Id: I14e3d4d60716355fa702cc77128e9da04e30a612
OSDN Git Service
