Scott Main
e9e311a47b
am fa83b5e4
: Merge "docs: update sdk download template DO NOT MERGE add windows installer and revise a bit else" into gingerbread
...
* commit 'fa83b5e4daf43a431463e80c56fe115a6db3ca04':
docs: update sdk download template DO NOT MERGE add windows installer and revise a bit else
2010-11-01 10:53:08 -07:00
Scott Main
fa83b5e4da
Merge "docs: update sdk download template DO NOT MERGE add windows installer and revise a bit else" into gingerbread
2010-11-01 10:49:07 -07:00
Raphael Moll
3a632f7d37
am 4aa7a190
: Merge "Fix "make acp" under Cygwin. DO NOT MERGE."
...
* commit '4aa7a190bb81b7e3ad12d53b83908c3c72745f6e':
Fix "make acp" under Cygwin. DO NOT MERGE.
2010-10-29 19:03:49 -07:00
Raphael Moll
4aa7a190bb
Merge "Fix "make acp" under Cygwin. DO NOT MERGE."
2010-10-29 18:53:07 -07:00
Jean-Baptiste Queru
b3a45feaf9
am 6a514dcc
: am 16bf5290
: (-s ours) Merge from AOSP froyo. Do not merge.
...
* commit '6a514dcc9d7d851d5cbe95ef7603d2bf0523a6a2':
CTS vm-tests now depend on hosttestlib.
2010-10-29 08:16:49 -07:00
Jean-Baptiste Queru
6a514dcc9d
am 16bf5290
: (-s ours) Merge from AOSP froyo. Do not merge.
...
* commit '16bf5290b1c8fcedda6c376db64f2bacbaf2c7a4':
CTS vm-tests now depend on hosttestlib.
2010-10-29 05:51:54 -07:00
Jean-Baptiste Queru
16bf5290b1
Merge from AOSP froyo. Do not merge.
...
CTS vm-tests now depend on hosttestlib.
Change-Id: Ie252227825ccb843b4be1205e3b135b7535b8a03
2010-10-29 05:49:08 -07:00
Scott Main
f086a6e434
docs: update sdk download template DO NOT MERGE
...
add windows installer and revise a bit else
Change-Id: Ie0ea7765d797cb54ee1d7fc733ec6db4fdedac3a
2010-10-28 00:21:25 -07:00
Raphael Moll
e6add13d71
Fix "make acp" under Cygwin. DO NOT MERGE.
...
Change-Id: I52ae8d4835b27a712d4795e7f41fa9ca4f3a822d
2010-10-27 19:06:12 -07:00
Brett Chabot
6e644e14cb
am ebf4b519
: cherry pick \'CTS vm-tests depend on hostestlib\' into GB.
2010-10-27 18:56:53 -07:00
Brett Chabot
ebf4b5190a
cherry pick 'CTS vm-tests depend on hostestlib' into GB.
...
Original description:
CTS vm-tests now depend on hosttestlib.
Bug 3125713
Conflicts:
core/tasks/cts.mk
Change-Id: I9e364a9d9d2cae396691921424ca591beca05468
2010-10-27 18:49:33 -07:00
Jean-Baptiste Queru
ba8d47b764
Merge "CTS vm-tests now depend on hosttestlib." into froyo
2010-10-27 14:59:39 -07:00
Brett Chabot
bdb51d7c64
CTS vm-tests now depend on hosttestlib.
...
Bug 3125713
Change-Id: I5774df2abeff7dd82e1218138d1ea3b25edd0901
2010-10-26 18:55:56 -07:00
Scott Main
6084cc948c
am 9d32bd5b
: docs: css tweak to Ps in sidebox. DO NOT MERGE.
...
Merge commit '9d32bd5b03c92e9220ff6cca029a587f5f3c754c' into gingerbread-plus-aosp
* commit '9d32bd5b03c92e9220ff6cca029a587f5f3c754c':
docs: css tweak to Ps in sidebox. DO NOT MERGE.
2010-10-25 17:22:50 -07:00
Scott Main
9d32bd5b03
docs: css tweak to Ps in sidebox. DO NOT MERGE.
...
Change-Id: Ifa3e4a9a2c2ba67b6da615ebc336c897dd9caeda
2010-10-25 17:15:12 -07:00
Jean-Baptiste Queru
cbc479c3a6
Set defauilt ringtone and default notification in full builds
...
Change-Id: Ia5c76d393d428dffc72cb8440720fa0f0884e401
2010-10-24 13:31:17 -07:00
Jean-Baptiste Queru
cd3bd7402f
Use the new list of all audio files
...
Change-Id: Ic510c243dde616cca3374f6aa6a2835690cf6818
2010-10-22 18:56:30 -07:00
Jean-Baptiste Queru
68f21cdc71
Minor cleanup - DO NOT MERGE
...
Change-Id: I0fc4e3c45ae5a545f1a02ed974bc3c7500286e22
2010-10-22 16:13:20 -07:00
Jean-Baptiste Queru
dd46ad41ff
Clean up full config - DO NOT MERGE
...
This splits the existing full.mk in two parts:
-One is the device-independent full_base.mk
-The other is the emulator-specific device.mk
This way we'll be able to inherit from full_base.mk
for on-device builds without any emulator-specific
files getting in the way.
Change-Id: Ieb1f4ed47988c8fff119ff53f1f374032da3752d
2010-10-22 15:00:24 -07:00
Ying Wang
e67944ee12
Switch Unbundled apps from generic.mk to full.mk.
...
Change-Id: I7aaaef8f2032590d55ccec77621c6b3f4c121f9a
2010-10-22 14:14:59 -07:00
Jean-Baptiste Queru
040e8cf01b
Fix list of locales (bad country codes).
...
DA->DK, SV->SE
Change-Id: I7bc7f64905ecd583e1a7ca5b43a8fffd5f3ba383
2010-10-22 12:34:32 -07:00
Jean-Baptiste Queru
8928ef8b4c
Make a full list of locales available
...
Use it for the sim build and full build.
Change-Id: I64dfa7ac1b374529ef5f0c1460dd35171311115e
2010-10-22 10:49:23 -07:00
Jean-Baptiste Queru
0332f0ac1e
Truly default to the full config.
...
It is much better than generic for emulator-based work.
Change-Id: I8b69b208bc4969d3f95c3467ca6737de8fd9460d
2010-10-22 10:03:49 -07:00
Ying Wang
4038bbc426
am 09a00a67
: Don\'t build update zip package if there is no kernel, or it\'s generic device.
...
Merge commit '09a00a672bb18dccc97af6090739ea275c39d8a3' into gingerbread-plus-aosp
* commit '09a00a672bb18dccc97af6090739ea275c39d8a3':
Don't build update zip package if there is no kernel, or it's generic device.
2010-10-20 14:28:52 -07:00
Ying Wang
09a00a672b
Don't build update zip package if there is no kernel, or it's generic device.
...
Move the update package code block forward to be side by side with the ota package code,
so that they are built under the same condition.
Bug: 3116070
Change-Id: I8055909cc614bfbeee215d1b770a80f728e326ee
2010-10-20 14:12:21 -07:00
Jean-Baptiste Queru
5a98ec046c
resolved conflicts for merge of 54ddcc27
to gingerbread-plus-aosp
...
Change-Id: I336f9e6859dce3bb18224b3340837474319c809c
2010-10-19 15:19:45 -07:00
Jean-Baptiste Queru
54ddcc2724
Merge "Explicitly declare assembly only __ASSEMBLY__ macro for assembly source"
2010-10-19 14:43:38 -07:00
Jean-Baptiste Queru
b9e0af8e05
Ignore 8cd38383
from gingerbread
...
Change-Id: I6414756b09317f0131ac443bf4b1acad82a2574b
2010-10-18 15:40:15 -07:00
Dianne Hackborn
8cd3838371
Gingerbread becomes real.
...
Change-Id: I20668ef8a9221b802d785e9c8ea1b6b882f828ac
2010-10-18 11:46:50 -07:00
Scott Main
672066778b
am c0aa1e1b
: Merge "remove whitespace from end of package descriptions, which added new lines when the summary includes a paragraph. Do not merge." into gingerbread
...
Merge commit 'c0aa1e1b305d85baef1dcedabbea1d084f3ed54a' into gingerbread-plus-aosp
* commit 'c0aa1e1b305d85baef1dcedabbea1d084f3ed54a':
remove whitespace from end of package descriptions, which added new lines when the summary includes a paragraph. Do not merge.
2010-10-15 18:22:09 -07:00
Nick Pelly
b4977f5980
am e07a9d4a
: Always install libnfc_ndef.
...
Merge commit 'e07a9d4aa4afd27461877fbfd4b132a5c6c34954' into gingerbread-plus-aosp
* commit 'e07a9d4aa4afd27461877fbfd4b132a5c6c34954':
Always install libnfc_ndef.
2010-10-15 18:21:29 -07:00
Scott Main
c0aa1e1b30
Merge "remove whitespace from end of package descriptions, which added new lines when the summary includes a paragraph. Do not merge." into gingerbread
2010-10-15 11:20:26 -07:00
Scott Main
5466af5017
remove whitespace from end of package descriptions, which added new lines when the summary includes a paragraph. Do not merge.
...
Change-Id: Ic8a7bec4f9a0aa81b8ab18d340281ad0d7e7c053
2010-10-15 11:18:58 -07:00
Nick Pelly
e07a9d4aa4
Always install libnfc_ndef.
...
libnfc_ndef is the (very small) library to implement NDEF message parsing.
Change-Id: Iab39a0904e1be2eb1fb07ef9f5cef5095c8a5b7b
Signed-off-by: Nick Pelly <npelly@google.com>
2010-10-15 02:16:40 -07:00
Jim Huang
20d1ba602b
Explicitly declare assembly only __ASSEMBLY__ macro for assembly source
...
To isolate the assembly-only macros in header files, such as
<machine/cpu-features.h>, this patch attempts to declare assembly
only __ASSEMBLY__ macro in build system.
Change-Id: I081c3e46258a9256b20995e4d0b473c64745444c
2010-10-14 16:17:31 +08:00
Xavier Ducrohet
bf4643e2df
am 1aff79ad
: Add SystemUI (notification bar) to SDK build.
...
Merge commit '1aff79ad44bc4fd6aa5ec2d0922afe5a6bcf455d' into gingerbread-plus-aosp
* commit '1aff79ad44bc4fd6aa5ec2d0922afe5a6bcf455d':
Add SystemUI (notification bar) to SDK build.
2010-10-13 22:53:45 -07:00
Xavier Ducrohet
1aff79ad44
Add SystemUI (notification bar) to SDK build.
...
Change-Id: I3f7001bfcf4ce61a523f7b24f61117225362b5a0
2010-10-13 17:26:29 -07:00
Bill Napier
00b31bee97
am fcab8402
: Merge "Add in MonkeyRunner target (and dependent libs) to SDK build."
...
Merge commit 'fcab84025edd6ff0a7b1f380b75b99297e0b7c31' into gingerbread-plus-aosp
* commit 'fcab84025edd6ff0a7b1f380b75b99297e0b7c31':
Add in MonkeyRunner target (and dependent libs) to SDK build.
2010-10-11 15:30:09 -07:00
Bill Napier
fcab84025e
Merge "Add in MonkeyRunner target (and dependent libs) to SDK build."
2010-10-11 15:18:04 -07:00
Xavier Ducrohet
a0eb715ab0
am 747bc08a
: Merge "Add all languages to the SDK image." into gingerbread
...
Merge commit '747bc08a8e78c47395bcc72811bb3e81fb7e557b' into gingerbread-plus-aosp
* commit '747bc08a8e78c47395bcc72811bb3e81fb7e557b':
Add all languages to the SDK image.
2010-10-10 14:37:00 -07:00
Xavier Ducrohet
747bc08a8e
Merge "Add all languages to the SDK image." into gingerbread
2010-10-10 14:31:10 -07:00
Xavier Ducrohet
8d3559ee91
Add all languages to the SDK image.
...
Change-Id: I5d715fdc7f802a55786fff73863bbbc108c780d4
2010-10-10 14:14:49 -07:00
Bill Napier
0e9473acfb
Add in MonkeyRunner target (and dependent libs) to SDK build.
...
Change-Id: I396635324cf9d2e590513228f5de5cea9df4dfd3
2010-10-10 12:06:57 -07:00
Bill Napier
04345cb114
Add in MonkeyRunner target (and dependent libs) to SDK build.
...
Change-Id: I6aa0b1e48dfd0017b3c68fb3b25c02b703ecbd53
2010-10-08 17:37:29 -07:00
Brian Muramatsu
99185c2a46
am cd7170d7
: resolved conflicts for merge of 0f8fcbe2
to gingerbread
...
Merge commit 'cd7170d7ee81d1be9e5c93e9e372e2b58fe5d959' into gingerbread-plus-aosp
* commit 'cd7170d7ee81d1be9e5c93e9e372e2b58fe5d959':
Support Additional CTS Host Jars
2010-10-07 15:48:15 -07:00
Jean-Baptiste Queru
547b902e99
am d29f5df3
: Merge "Add TTS language files to the full build." into gingerbread
...
Merge commit 'd29f5df3663acb01f88347b67056d969e2d49d15' into gingerbread-plus-aosp
* commit 'd29f5df3663acb01f88347b67056d969e2d49d15':
Add TTS language files to the full build.
2010-10-07 15:48:02 -07:00
Jean-Baptiste Queru
424de1779d
resolved conflicts for merge of 0f085e5a
to gingerbread-plus-aosp
...
Change-Id: If89721a5ee86b9ce27a2235ecd75f3eceec7def7
2010-10-07 15:00:12 -07:00
Brian Muramatsu
cd7170d7ee
resolved conflicts for merge of 0f8fcbe2
to gingerbread
...
Change-Id: I0e1f13f957cba6dc90ba8a6aac6d3240b5be9019
2010-10-07 14:31:21 -07:00
Jean-Baptiste Queru
d29f5df366
Merge "Add TTS language files to the full build." into gingerbread
2010-10-07 14:26:31 -07:00
Jean-Baptiste Queru
0f085e5a85
Merge "Explicitly request ip-up-vpn"
2010-10-07 14:16:35 -07:00