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
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
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
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
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
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
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
8921ea6982
am 04345cb1: Add in MonkeyRunner target (and dependent libs) to SDK build.
...
Merge commit '04345cb1147f220c67410c16b362223b1e8952f7'
* commit '04345cb1147f220c67410c16b362223b1e8952f7':
Add in MonkeyRunner target (and dependent libs) to SDK build.
2010-10-11 10:21:10 -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
Jean-Baptiste Queru
9e0892c350
Cherry-pick 547b902e
...
"am d29f5df3: Merge "Add TTS language files to the full build." into gingerbread"
Change-Id: Iea988350124dacf085244addf34a6f216b58cf77
2010-10-08 07:39:07 -07:00
Jean-Baptiste Queru
be24f6f800
Cheryr-pick of 424de177
...
"resolved conflicts for merge of 0f085e5a
to gingerbread-plus-aosp"
Change-Id: If2932eeb7a6f0420edf52ac343901afd68ce11fa
2010-10-08 07:32:59 -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
Jean-Baptiste Queru
0b44f50d5f
Add TTS language files to the full build.
...
Bug: 3065214
Change-Id: I5c324965e693fe26d686b92d869e33facc92c762
2010-10-06 08:05:44 -07:00
Dianne Hackborn
3afdaa8507
am 3367df34: am 2f85f654: Merge "Add location shared library to core build." into gingerbread
...
Merge commit '3367df348cb8b3bd6f6ff834d5cbfebfaf20e444'
* commit '3367df348cb8b3bd6f6ff834d5cbfebfaf20e444':
Add location shared library to core build.
2010-09-28 17:40:09 -07:00
Dianne Hackborn
3367df348c
am 2f85f654: Merge "Add location shared library to core build." into gingerbread
...
Merge commit '2f85f654eea8255ee4acd7230e4f72fc2cdaacb5' into gingerbread-plus-aosp
* commit '2f85f654eea8255ee4acd7230e4f72fc2cdaacb5':
Add location shared library to core build.
2010-09-28 17:19:25 -07:00
Dianne Hackborn
588fab8bbc
Add location shared library to core build.
...
Change-Id: I3ea62e2fb29611337044d4c3c10f756fb5d35f43
2010-09-28 14:25:05 -07:00
Jean-Baptiste Queru
05496fff27
resolved conflicts for merge of 9bfa95cf
to master
...
Change-Id: I70cfcd1de8a9d56900f81c174e33e433bae0508d
2010-09-28 07:20:52 -07:00
Jean-Baptiste Queru
9bfa95cfff
am 6bc232a1: Merge "Don\'t reference CarHome and CarHomeLauncher" into gingerbread
...
Merge commit '6bc232a11621740d14f517218d2599a714fb451f' into gingerbread-plus-aosp
* commit '6bc232a11621740d14f517218d2599a714fb451f':
Don't reference CarHome and CarHomeLauncher
2010-09-27 17:28:24 -07:00
Jean-Baptiste Queru
102b8f46a5
Don't reference CarHome and CarHomeLauncher
...
They're not actually part of AOSP
Change-Id: Iacb832173be7faa8ea22f74ca25e1fd68ef1dbdb
2010-09-27 17:04:41 -07:00
Jean-Baptiste Queru
8666dd63c7
Explicitly handle bluetooth files.
...
This also allows to separate smartphone and nonsmartphone variants.
Change-Id: Icbd7c78a866bae32f060607f8a898d59fcd45830
2010-09-27 15:35:33 -07:00
Mathias Agopian
e93e533218
add screencap to PRODUCT_PACKAGES
...
Change-Id: Ibe0a436e80082788dfab9d43a45c99d9a87633aa
2010-09-26 18:52:23 -07:00
Jean-Baptiste Queru
a737b8371d
Explicitly request ip-up-vpn
...
Change-Id: I05c1a3f75e9a2b9040fda3e00f0b659c613968b1
2010-09-26 10:07:09 -07:00
Ying Wang
44f4021041
Add wpa_supplicant.conf to the core.mk
...
Note that wpa_supplicant.conf will only be built only if the wpa_supplicant_conf.mk
is included with some conditionals.
Bug: 3003508
Change-Id: I3d1a705c5ff5fd23a8828d5aa756ab2e4edcf4d2
2010-09-24 11:14:16 -07:00
Jesse Wilson
fed45d859a
am 77070aa7: am ce7d5023: Turn dalvikvm host builds on by default when linux is the host OS.
...
Merge commit '77070aa757806d1617d707db4d2bd7931b2353fc'
* commit '77070aa757806d1617d707db4d2bd7931b2353fc':
Turn dalvikvm host builds on by default when linux is the host OS.
2010-09-22 13:53:41 -07:00
Jesse Wilson
77070aa757
am ce7d5023: Turn dalvikvm host builds on by default when linux is the host OS.
...
Merge commit 'ce7d5023c3df4c16ae395d64d51dd8345e40a39e' into gingerbread-plus-aosp
* commit 'ce7d5023c3df4c16ae395d64d51dd8345e40a39e':
Turn dalvikvm host builds on by default when linux is the host OS.
2010-09-22 11:55:29 -07:00
Jesse Wilson
ce7d5023c3
Turn dalvikvm host builds on by default when linux is the host OS.
...
Previously host builds were only enabled under user and user-debug
builds. This will make it easier for Androids to find out if they've
inadvertently broken host compatibility in native code.
Change-Id: Id1f2d5e189c4c1b6462fe03bab1b0f75e98a599c
2010-09-22 11:39:18 -07:00
Ying Wang
03e76ace38
Add a new layer generic_no_telephony.mk
...
Bug: 2994028
Change-Id: I2a1831bb8dd1245c6cc0116738c118fe895b6e43
2010-09-21 16:28:29 -07:00
Steve Howard
a188df5cd7
am 1a297b84: am 1020d271: Add new downloads UI to core build.
...
Merge commit '1a297b84c8e293a7cd7e2e743d4bf5d0068d8fba'
* commit '1a297b84c8e293a7cd7e2e743d4bf5d0068d8fba':
Add new downloads UI to core build.
2010-09-20 11:57:10 -07:00
Steve Howard
1a297b84c8
am 1020d271: Add new downloads UI to core build.
...
Merge commit '1020d271c67b062e95b61c4eb9f1f5168e2b6197' into gingerbread-plus-aosp
* commit '1020d271c67b062e95b61c4eb9f1f5168e2b6197':
Add new downloads UI to core build.
2010-09-20 11:52:57 -07:00
Steve Howard
1020d271c6
Add new downloads UI to core build.
...
Change-Id: I96a3bb10beb6c1ec9c48baa2e2039aab7c421b09
2010-09-20 11:44:54 -07:00
Brian Carlstrom
6821dbad65
Only turn host build on for linux
...
Change-Id: I2d3b16f7881ad82cf272a40213dd4e173f54baa0
2010-09-16 22:49:10 -07:00
Brian Carlstrom
cec75adb64
am c05d0000: Only turn host build on for linux
...
Merge commit 'c05d0000bb3e91a21c2cc7cbd85232f1afc7a8d2' into gingerbread-plus-aosp
* commit 'c05d0000bb3e91a21c2cc7cbd85232f1afc7a8d2':
Only turn host build on for linux
2010-09-16 22:13:50 -07:00
Brian Carlstrom
c05d0000bb
Only turn host build on for linux
...
Change-Id: I595948b159bc6a2bf295fd11ab831f978e38c799
2010-09-16 21:49:01 -07:00
Jesse Wilson
8caaeddcc0
resolved conflicts for merge of d9de6588
to master
...
Change-Id: I3d7d6744b4f0d7c10bf001c87c0abbb4cb6885ef
2010-09-16 17:57:47 -07:00
Jesse Wilson
d9de658868
am 852f43bd: Include dalvik+libcore dependencies in core product definitions.
...
Merge commit '852f43bd29da34ff15799b88c3db166428cea6d8' into gingerbread-plus-aosp
* commit '852f43bd29da34ff15799b88c3db166428cea6d8':
Include dalvik+libcore dependencies in core product definitions.
2010-09-16 17:48:29 -07:00
Jesse Wilson
852f43bd29
Include dalvik+libcore dependencies in core product definitions.
...
Also conditionally include host-only dependencies when the host is
being built.
Change-Id: I0e8c9c1bef5ee60d4c1ce1c158f41b7642f9a8f2
2010-09-16 15:34:00 -07:00
Jean-Baptiste Queru
1eeec7cb41
am 24ab0f58: am 85f351d1: Merge "Allow devices without AndroidBoard.mk" into gingerbread
...
Merge commit '24ab0f58f45fe27ddb48e279c1e0be8105dc8f96'
* commit '24ab0f58f45fe27ddb48e279c1e0be8105dc8f96':
Allow devices without AndroidBoard.mk
2010-09-15 17:53:46 -07:00
Jean-Baptiste Queru
24ab0f58f4
am 85f351d1: Merge "Allow devices without AndroidBoard.mk" into gingerbread
...
Merge commit '85f351d1f925b265c401f1992b57dc028d462453' into gingerbread-plus-aosp
* commit '85f351d1f925b265c401f1992b57dc028d462453':
Allow devices without AndroidBoard.mk
2010-09-15 12:56:42 -07:00