The Android Open Source Project
f56e9165d9
merge from open-source master
...
Change-Id: I2169fb30a5bfe48501745b2141e82ad9e25971aa
2010-06-08 13:14:30 -07:00
Jean-Baptiste Queru
64947314b7
Merge "Build BUILD_MULTI_PREBUILT for the prebuilt target"
2010-06-08 10:06:47 -07:00
The Android Open Source Project
4873d8f5ca
merge from open-source master
...
Change-Id: Id3161ac44e0eaba0184b3d2d4af43e4e40d26e90
2010-06-04 07:56:24 -07:00
Jeff Hamilton
8d09b69e2d
Build host tools as 32bit on all Darwin machines.
...
Change-Id: I121b388056e68b787518c66a01c172bc4ffaef9b
2010-06-03 17:59:11 -05:00
Ying Wang
e8ffa14900
am ba16a89d: Override LOCAL_CERTIFICATE in inherit-package.
...
Merge commit 'ba16a89dbd61003a3b907d0f5e8fc48fba2afcab' into froyo-plus-aosp
* commit 'ba16a89dbd61003a3b907d0f5e8fc48fba2afcab':
Override LOCAL_CERTIFICATE in inherit-package.
2010-06-02 14:37:28 -07:00
Ying Wang
ba16a89dbd
Override LOCAL_CERTIFICATE in inherit-package.
...
it's to fix typo.
Change-Id: I9a791faa4b7b5967b5d23bfcb4caeebaef94e723
2010-06-02 13:24:36 -07:00
Ying Wang
b93e03cbc9
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
2010-06-02 13:09:12 -07:00
Ying Wang
5291130983
Cherry-pick unbundled build changes from master
...
Change-Id: I82cab32f00b7b729d9b01c8e1532c8bf0ad2fb92
2010-05-26 13:39:31 -07:00
Xavier Ducrohet
0c5363c857
am 8e5605a7: Add QuickSearchBox to the SDK build.
...
Merge commit '8e5605a774fd2f61c6d5bae0440b20fc0bdd79f7' into froyo-plus-aosp
* commit '8e5605a774fd2f61c6d5bae0440b20fc0bdd79f7':
Add QuickSearchBox to the SDK build.
2010-05-25 17:49:24 -07:00
Xavier Ducrohet
8e5605a774
Add QuickSearchBox to the SDK build.
...
Change-Id: Ia0cc7b4cd8245d368685d50cf32cd21875cbdbbf
2010-05-25 17:03:42 -07:00
Scott Main
b7ebe01f60
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"
2010-05-25 12:31:29 -07:00
Scott Main
ca671ab7a6
Revert "Doc change: Update froyo mark for home"
...
This reverts commit 9d1d6441d9
.
2010-05-25 12:22:29 -07:00
Christian Mehlmauer
8056ee21f0
generic.mk: Replaced AlarmClock with newer DeskClock App
...
Change-Id: I2afe4876b1dd7e9e9200e27ba64eebe4a34065fb
2010-05-22 22:22:26 +02:00
Dirk Dougherty
d44754e0e5
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.
2010-05-20 00:15:38 -07:00
Dirk Dougherty
e9b01eb46d
Doc change: add tv assets for carousel.
...
Change-Id: I357509c83e64ceb898b2069482ff1d0f3b3337cc
2010-05-19 19:42:12 -07:00
Dirk Dougherty
e5cfdbfb17
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
2010-05-19 18:58:05 -07:00
Dirk Dougherty
9d1d6441d9
Doc change: Update froyo mark for home
...
Change-Id: Idacecd87faca95cd258436ab842c03102e5fc6c6
2010-05-19 18:25:33 -07:00
The Android Open Source Project
bc12cd04b8
merge from open-source master
...
Change-Id: I0dd123dde8f0da42a99313cffed6a48d30e38381
2010-05-14 15:52:50 -07:00
Jean-Baptiste Queru
4dccdd6401
Merge "Use a different kernel boot line for the disk installer."
2010-05-14 15:47:56 -07:00
Jean-Baptiste Queru
f81d75ed47
Merge "Use a property to enable the eth0 LAN port on the emulator"
2010-05-14 15:47:39 -07:00
The Android Open Source Project
95f862bcb0
merge from open-source master
...
Change-Id: I4ea9aa2765cb634382da92ff17f5af9e2f6b4078
2010-05-14 14:35:29 -07:00
Jean-Baptiste Queru
f91e9e2729
Merge "Fix "make modules" script bug under Mac OS X."
2010-05-14 14:10:50 -07:00
The Android Open Source Project
9514fca5c7
merge from open-source master
...
Change-Id: Ia4cb27645bfd757fb75273ff5a6cbf3af57b3a03
2010-05-14 13:38:55 -07:00
Jean-Baptiste Queru
5eac957bdd
Merge "Updated to better distinguish between options and operands"
2010-05-14 12:21:31 -07:00
Jean-Baptiste Queru
be6b55ccc2
Merge "Support absolute path, in OUT_DIR"
2010-05-14 12:17:43 -07:00
Ravi K Yenduri
9bfd697cff
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
2010-05-10 14:51:56 -07:00
The Android Open Source Project
f7c634216e
merge from open-source master
...
Change-Id: Id99b6cbc613c6c7b9d1ef79274b1c28b808a32d4
2010-05-10 11:05:12 -07:00
Scott Main
de14ee5701
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
2010-05-10 10:26:20 -07:00
Scott Main
3494d9b3de
docs: lighten the "new" red. softens the effect and makes it more legible when selected
...
Change-Id: I0f1f70c281cc0a6f3621c898b04d3845924f6e35
2010-05-10 10:01:13 -07:00
Scott Main
9096ef382a
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
2010-05-10 09:43:15 -07:00
Jean-Baptiste Queru
7bb4f10a96
Merge "Replace arm with proper variable for CPU/ABI"
2010-05-07 12:53:45 -07:00
Bruce Beare
9d4c5b1c20
Use a different kernel boot line for the disk installer.
...
Change-Id: I6b20386a24e1141bfe2a252b635243c235d46865
2010-05-07 11:51:30 -07:00
Scott Main
3044d243c9
Merge "add froyo graphic for homepage and fix css bug" into froyo
2010-05-07 11:32:12 -07:00
Dan Bornstein
6e079d7e3d
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,
2010-05-06 16:12:06 -07:00
Dan Bornstein
03fb96f01e
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
2010-05-06 12:43:47 -07:00
Scott Main
ae98747d7c
add froyo graphic for homepage and fix css bug
...
Change-Id: Ie040686a6c7982233d72298403a88f794b6b26db
2010-05-06 11:43:08 -07:00
The Android Open Source Project
f9e275b0c7
merge from open-source master
...
Change-Id: Ie06ab3b2424480706c644f1a803a6e3de400f15d
2010-05-05 15:16:56 -07:00
Dan Bornstein
aed937ba46
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:
2010-05-05 14:37:24 -07:00
Dan Bornstein
3ca0e96a3a
Merge "Fixed a bunch of stuff in the prelink mappings file:" into froyo
2010-05-05 14:36:04 -07:00
Bruce Beare
5b9f19e58f
Replace arm with proper variable for CPU/ABI
...
Change-Id: If8594d9a2abf4d8c08b5ccea612bb700afa9e9b7
2010-05-05 11:26:04 -07:00
Bruce Beare
a197281bc2
Use a property to enable the eth0 LAN port on the emulator
...
Change-Id: I26f4ec7fac9b7a8ad3013914967cf0f8fdec91ff
2010-05-05 09:52:23 -07:00
Bruce Beare
f9f1a9d764
Add support for x86 VirtualBox Emulation
...
To make a VirtualBox install image,
make installer_img
2010-05-05 09:52:09 -07:00
Dan Bornstein
7dfcfbc0d4
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
2010-05-05 00:10:37 -07:00
Scott Main
e59de21b8a
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
2010-05-04 18:18:02 -07:00
Scott Main
74108deaf1
fix css bug for paragraphs in table cells
...
- only select the direct descendant for p:last-child in a td
Change-Id: I9ad63b80914fbfe4d3e74041915f67b7a08d9649
2010-05-04 17:24:26 -07:00
The Android Open Source Project
ae4e14556b
merge from open-source master
...
Change-Id: I3d24628d38c99369f242733d9089d7c5669a4623
2010-05-03 16:11:04 -07:00
Jean-Baptiste Queru
f015e94dc8
Adapt to new location of libcore
...
Change-Id: I316355751db621d318a78dc6e844d6bf2c7fdc87
2010-05-03 09:52:03 -07:00
Doug Zongker
1d37a0dad8
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
2010-04-30 14:24:34 -07:00
Jean-Baptiste Queru
045d4af72d
Adapt to new location of libcore
...
Change-Id: Ibabfe907f00522c1966ddc333352eaea2bdcb5bd
2010-04-30 13:22:56 -07:00
Alexey Tarasov
73fda1b973
Make expr more POSIXy
...
Change-Id: I939cf1f227c14112656804d69c1afd7ead4a31ed
2010-04-29 14:19:28 -07:00