Jean-Baptiste Queru
5002433ba8
resolved conflicts for merge of cd3bd740
to master
...
Change-Id: I07aaf337e325b1cec652497f2630b5c42096f9a5
2010-10-24 06:08:24 -07:00
Jean-Baptiste Queru
dd15bec71f
Merge "Delete obsolete full_no_telephony.mk"
2010-10-24 04:53:58 -07:00
Shih-wei Liao
c656030f7d
Turn off llvm-rs-link to make launch time go faster.
...
Change-Id: Idbbb5e24a269e3c9a1911b47b4fbb1616cef5803
2010-10-23 03:07:13 -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
3814fc914b
am 68f21cdc: (-s ours) Minor cleanup - DO NOT MERGE
...
Merge commit '68f21cdc71b9ad7362e4f7c22d44a601c9e58f07'
* commit '68f21cdc71b9ad7362e4f7c22d44a601c9e58f07':
Minor cleanup - DO NOT MERGE
2010-10-22 18:03:47 -07:00
Jean-Baptiste Queru
5024299a51
Delete obsolete full_no_telephony.mk
...
Change-Id: I944209ce5dc70cd1f43a9204faff38bc367d923f
2010-10-22 16:47:37 -07:00
Jean-Baptiste Queru
cfbcd758d8
Improve setup of base products.
...
Split telephony into its own product, so that we can easily
add telephony support to any configuration without pulling
anything else. Use it from generic.
Split the "full" family between a (no-telephony) base,
a telephony version of the same (both of which can be used
as a starting point for on-device builds), and the true classic
full which is an emulator build.
Change-Id: I616d34f2a29415b8ec997173f8e893c312ade5c2
2010-10-22 16:47:31 -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
d501f74271
am dd46ad41: (-s ours) Clean up full config - DO NOT MERGE
2010-10-22 15:10:18 -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
663c9f2d59
resolved conflicts for merge of e67944ee
to master
...
Change-Id: I9284d5a5df6fc963bc4c70c87a505857f41c93af
2010-10-22 14:41:17 -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
40d2e65e3b
am 040e8cf0: Fix list of locales (bad country codes).
2010-10-22 13:02:38 -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
09fa73b3c3
resolved conflicts for merge of 8928ef8b
to master
...
Change-Id: I0c2fa435b38266f71651756570926c4b1488b57e
2010-10-22 12:29:27 -07:00
Jean-Baptiste Queru
6c75cb3752
am 0332f0ac: Truly default to the full config.
2010-10-22 12:12:52 -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
Ben Cheng
a1729fc593
Merge "Insert directives to work around a CPU bug."
2010-10-22 09:49:47 -07:00
Ben Cheng
efd2489b39
Insert directives to work around a CPU bug.
...
Bug: 3117632
Change-Id: I2fb58e7093984d18d2d2d21edf687206f4ddab31
2010-10-21 15:15:09 -07:00
Ying Wang
2923c45d39
am 4038bbc4: am 09a00a67: Don\'t build update zip package if there is no kernel, or it\'s generic device.
...
Merge commit '4038bbc426776d8adc57d7c3c8123357b50b1615'
* commit '4038bbc426776d8adc57d7c3c8123357b50b1615':
Don't build update zip package if there is no kernel, or it's generic device.
2010-10-21 13:45:14 -07:00
Dianne Hackborn
894bf9c0a4
Merge "We are API 9 compatible."
2010-10-21 10:51:08 -07:00
Jean-Baptiste Queru
2ea6527e7b
am 5a98ec04: resolved conflicts for merge of 54ddcc27
to gingerbread-plus-aosp
...
Merge commit '5a98ec046c555b02d2f306efc117f7dafd32fc7d'
* commit '5a98ec046c555b02d2f306efc117f7dafd32fc7d':
Explicitly declare assembly only __ASSEMBLY__ macro for assembly source
2010-10-21 09:53:57 -07:00
Dianne Hackborn
311c267e15
We are API 9 compatible.
...
Change-Id: Ice1c07993fb66c12cafeaefa874a7adbb19caf21
2010-10-20 18:54:17 -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
02800879e7
am b9e0af8e: Ignore 8cd38383
from gingerbread
...
Merge commit 'b9e0af8e059121eac4b7cedba2c0679088bc2466'
* commit 'b9e0af8e059121eac4b7cedba2c0679088bc2466':
Gingerbread becomes real.
2010-10-19 09:56:28 -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
4defb05389
am 67206677: (-s ours) 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 '672066778bdf3aacdd859b88484cddbd6c8b7909'
* commit '672066778bdf3aacdd859b88484cddbd6c8b7909':
remove whitespace from end of package descriptions, which added new lines when the summary includes a paragraph. Do not merge.
2010-10-17 11:17:33 -07:00
Nick Pelly
ecabc59361
am b4977f59: am e07a9d4a: Always install libnfc_ndef.
...
Merge commit 'b4977f5980fb4045fc12fbb630823ee8deb814d7'
* commit 'b4977f5980fb4045fc12fbb630823ee8deb814d7':
Always install libnfc_ndef.
2010-10-17 11:17:24 -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
Xavier Ducrohet
67c0c08b9a
am bf4643e2: am 1aff79ad: Add SystemUI (notification bar) to SDK build.
...
Merge commit 'bf4643e2df9aafabca103f9242b5e7c7da9ded58'
* commit 'bf4643e2df9aafabca103f9242b5e7c7da9ded58':
Add SystemUI (notification bar) to SDK build.
2010-10-15 13:40:46 -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
Ying Wang
9af2da0d94
Merge "Verify PRODUCT_* are not modified by Android.mks, but allow them to be read only."
2010-10-15 10:05:02 -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
Doug Zongker
98582b28e8
radio files aren't modules, prebuilt or otherwise
...
Change-Id: Ic21cf9f7d9657819e40c6700c98e61971dab24b4
2010-10-13 13:39:56 -07:00
Bill Napier
3dfe7f1d89
am 00b31bee: am fcab8402: Merge "Add in MonkeyRunner target (and dependent libs) to SDK build."
...
Merge commit '00b31bee97eb739b03eedddf1cd07a86b50259d8'
* commit '00b31bee97eb739b03eedddf1cd07a86b50259d8':
Add in MonkeyRunner target (and dependent libs) to SDK build.
2010-10-12 16:27:42 -07:00
Joe Onorato
439d9a09f9
resolved conflicts for merge of a0eb715a
to master
...
Change-Id: I6341ca672906de3c21800730ac28ba90ecab51ca
2010-10-11 17:12:46 -07:00
Ying Wang
4a5bd245ff
Fix typo.
...
Change-Id: Iabdc6ec1ead4f37294f01ebebc1e71e188455533
2010-10-11 16:36:02 -07:00
Ying Wang
7522f04a4b
Verify PRODUCT_* are not modified by Android.mks, but allow them to be read only.
...
Bug: 3076955
Change-Id: I7ddcc5b9d6325d3a3c63f952f97034ddf223630a
2010-10-11 16:33:37 -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