Wink Saville
4d67e91644
am d09b2e55
: Merge "WAPPushManager, WAP Push over SMS message handler"
...
* commit 'd09b2e552788cc90813e930e3912651e053c657c':
WAPPushManager, WAP Push over SMS message handler
2011-03-01 12:39:42 -08:00
Marc Blank
784f377fee
Add Exchange to build targets
...
Change-Id: I24c661140e1129ff2e47a1dbbafe5d9040bc08a3
2011-02-25 11:18:47 -08:00
Jean-Baptiste Queru
4b35d1aba0
Fix x86 build.
...
Change-Id: I22dc39a68911e1b5846c20e63c0f8c59521ea7f5
2011-02-03 09:55:47 -08:00
The Android Open Source Project
3b6bf4484e
Mass merge from gingerbread - do not merge
...
Change-Id: Idbfeda9c0a9720d894352747c01754ed2c90c44d
2011-01-30 12:39:46 -08:00
Eric Fischer
2cbc3bb1fb
am 54a6b731
: Merge "Flesh out the languages_full list with recently added locales." into gingerbread
...
* commit '54a6b731da4029237410f04c1b6cb9b64bf2783f':
Flesh out the languages_full list with recently added locales.
2011-01-29 09:27:42 -08:00
Robert Greenwalt
824bc51ee8
am 75e557d1
: am b6c2b1c6
: Fix SDK connectivity.
...
* commit '75e557d11331afaca818ec60a75c3a62253d9542':
Fix SDK connectivity.
2011-01-24 17:51:14 -08:00
Robert Greenwalt
75e557d113
am b6c2b1c6
: Fix SDK connectivity.
...
* commit 'b6c2b1c62706689410b5d3818aacd6d3103b9b7a':
Fix SDK connectivity.
2011-01-24 17:48:52 -08:00
Robert Greenwalt
b6c2b1c627
Fix SDK connectivity.
...
Re-add the phone apk to the sdk build.
bug:3380122
Change-Id: I0b011557aba95fbe9be24d4356eddde4b163b80f
2011-01-24 16:32:18 -08:00
Brian Swetland
7cc2440994
make TINY_ANDROID build without the presence of frameworks/* and development/*
...
Change-Id: I795e27a9ce837b193c6d8d0516e2f523c17214e2
2011-01-23 18:56:08 -08:00
Eric Fischer
59ef5747bf
am e6e583ff
: am 7dfc1270
: am 54a6b731
: Merge "Flesh out the languages_full list with recently added locales." into gingerbread
...
* commit 'e6e583ffab4fd272ceb0c190223dd9e710336542':
Flesh out the languages_full list with recently added locales.
2011-01-21 14:40:26 -08:00
Eric Fischer
e6e583ffab
am 7dfc1270
: am 54a6b731
: Merge "Flesh out the languages_full list with recently added locales." into gingerbread
...
* commit '7dfc1270967c96be6dcd58fb7770c07482a7e90d':
Flesh out the languages_full list with recently added locales.
2011-01-21 14:37:20 -08:00
Ying Wang
611a4b25c1
am 04a4d9ad
: am 04e1f31d
: Move videoeditor libraries to generic_no_telephony.mk.
...
* commit '04a4d9ade8c3ac18476c0f5a934e4efc6365fee8':
Move videoeditor libraries to generic_no_telephony.mk.
2011-01-19 10:35:02 -08:00
Ying Wang
04e1f31dfd
Move videoeditor libraries to generic_no_telephony.mk.
...
Change-Id: I8ea2058b79ccfda3114ba64b4e43c175a0fe086c
2011-01-19 10:28:05 -08:00
Eric Fischer
7dfc127096
am 54a6b731
: Merge "Flesh out the languages_full list with recently added locales." into gingerbread
...
* commit '54a6b731da4029237410f04c1b6cb9b64bf2783f':
Flesh out the languages_full list with recently added locales.
2011-01-18 15:35:46 -08:00
Xavier Ducrohet
e9d77db619
am 155776bf
: am a17fe58b
: Update SDK app list.
...
* commit '155776bf06ece56db27abf84da9cbe5260c2cf36':
Update SDK app list.
2011-01-18 10:22:48 -08:00
Xavier Ducrohet
a17fe58b46
Update SDK app list.
...
Change-Id: I1a99b0bd716f90688aea9b9db20e393a91ad8ad2
2011-01-18 10:10:32 -08:00
Xavier Ducrohet
7bfa4a352e
am 0e581c25
: am aafe93b1
: Merge "Add librs_jni to the sdk product packages." into honeycomb
...
* commit '0e581c25d44afdf619e1903a5b471df7a69c073f':
Add librs_jni to the sdk product packages.
2011-01-18 09:54:23 -08:00
Dharmaray Kundargi
52288359b6
am fd5aca8b
: am c86bcf5f
: Merge "add videoeditor libraries to make" into honeycomb
...
* commit 'fd5aca8bb196e24b8b9c8189e2389f4f9087f804':
add videoeditor libraries to make
2011-01-17 23:30:57 -08:00
Xavier Ducrohet
92cbc443ec
Add librs_jni to the sdk product packages.
...
This is similar to 88e76ceca0
but the SDK build does not extend generic_no_telephony.
Change-Id: Id01178b2a89d002aca52d57ad7c9dfb4e1184216
2011-01-17 16:39:36 -08:00
Dharmaray Kundargi
c86bcf5f16
Merge "add videoeditor libraries to make" into honeycomb
2011-01-17 10:52:26 -08:00
David 'Digit' Turner
d0202e5390
am 665aefdd
: am 1fa29fc9
: Merge "Add librs_jni to the generic product packages." into honeycomb
...
* commit '665aefdd2a47abe7abff61a83e78a2e4470ca004':
Add librs_jni to the generic product packages.
2011-01-16 23:04:13 -08:00
Dharmaray Kundargi
21d812fd69
add videoeditor libraries to make
...
Change-Id: I024f087bd026f709fdbfc1272c79166ad9bf5bcd
2011-01-16 16:45:20 -08:00
David 'Digit' Turner
88e76ceca0
Add librs_jni to the generic product packages.
...
Without this, HC cannot start under emulation (because some RenderScript-related
classes fail to preload properly during the boot, killing Zygote, even if they
are later never used).
Change-Id: I825051603425df59b9677875eba0ae2a811649ee
2011-01-17 00:15:34 +01:00
Eric Fischer
1c81f3b01e
Flesh out the languages_full list with recently added locales.
...
Change-Id: I8c43feba15f03e0b204b2d3ef136ea6e6e2e4fe2
2011-01-14 15:23:23 -08:00
Jesse Wilson
7eff81df2a
Move apache-xml to external. (project 3 of 4)
...
Change-Id: Ib65348e4203e6ac653e9fe81369b21dad06b5b58
http://b/3351604
2011-01-13 17:21:58 -08:00
noda
ee8fe64709
WAPPushManager, WAP Push over SMS message handler
...
The WAPPushManager is a new, optional service for handling WAP Push
over SMS messages. This service allows a carrier to designate a high
priority handler for specific WAP Push over SMS messages without
affecting other WAP Push over SMS, binary SMS, or SMS text messages.
It is also optional, so that it can be configured out of the target
image resulting in no change in the WAP Push over SMS handling
behavior compared to the current AOSP.
- This patch adds the WAPPushManager to the core build.
Change-Id: Ib139a9dca8b18d4cd50b70c041a346584ef96279
2011-01-07 02:46:57 +09:00
Jason parks
a1e48dc30f
Add the CryptKeeper to the build.
...
Change-Id: I094c5f24cd7f9f1241d301984badd15b38eef33a
2011-01-05 14:51:42 -06:00
Brian Carlstrom
bf66dd3485
Scrub the set of dalvik modules that are built by default
...
Bug: 3009435
Change-Id: I20d88df665e48aa74c20cef7e236de377cd0d14b
2010-12-14 22:35:10 -08:00
Daniel Sandler
87c983ca57
Protips: End of line.
...
Bug: 3248626
Change-Id: Iecf180f64df492a3bd907697cb0778e60031ed8a
2010-12-13 12:46:17 -05:00
Kenny Root
696180ecda
Add installd to PRODUCT_PACKAGES
...
Another change adds the "optional" tag to installd, so moving it here
and removing it from the grandfathered list.
Change-Id: I035ffd527d007cf104c15890509976fc9b99d216
2010-12-03 11:00:40 -08:00
Jeff Brown
99aacc211e
Use prebuilt keymaps in frameworks/base/data/keyboards.
...
Change-Id: I847167abaf5538a45f40df0ed5d69c9848284871
2010-11-18 00:08:24 -08:00
Xavier Ducrohet
6a5b27a4e2
Temp disabling of some apps in SDK build.
...
Change-Id: Ib8495cfe935ab96997f19e9af5a93ebbb99493ab
2010-11-15 18:31:48 -08:00
Xavier Ducrohet
63ae1fa6bb
Temporarily remove some apps from the SDK build.
...
Change-Id: Ic23449ee144f0bf4ba4a208e8742a7db31d1b8a4
2010-11-02 18:35:45 -07:00
Xavier Ducrohet
d4dfc2b923
Add the fonts to the SDK system image.
...
Change-Id: I905e42b8ca44901adc15b083689c2252a18ce130
2010-11-02 13:59:40 -07:00
Jean-Baptiste Queru
bbd03141b4
resolved conflicts for merge of cbc479c3
to master
...
Change-Id: Ie421c405d2a52f6c7f1d65f44e0576e32842a559
2010-10-24 14:02:10 -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
5002433ba8
resolved conflicts for merge of cd3bd740
to master
...
Change-Id: I07aaf337e325b1cec652497f2630b5c42096f9a5
2010-10-24 06:08:24 -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
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
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
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
12722d34c8
Merge "Explicitly manage fonts and ICU data"
2010-09-15 09:53:05 -07:00
Ying Wang
8e052ff521
am f6332cfa
: am b125c81c
: Refine the comment.
...
Merge commit 'f6332cfaf2b64e0c7436bd80c8b9cb145c0ff5b1'
* commit 'f6332cfaf2b64e0c7436bd80c8b9cb145c0ff5b1':
Refine the comment.
2010-09-15 07:06:36 -07:00
Jean-Baptiste Queru
c9c3fd3043
Explicitly manage fonts and ICU data
...
Change-Id: I2fa61378956ccc230b4268b4cc201e7e9950f111
2010-09-14 14:42:10 -07:00
Jean-Baptiste Queru
30dfc9a6b8
Revert "Explicitly manage fonts and ICU data"
...
This reverts commit b315d46bc8
.
2010-09-14 14:08:00 -07:00
Jean-Baptiste Queru
b315d46bc8
Explicitly manage fonts and ICU data
...
Change-Id: If08edf37f06d9978326202797c52a0cae2f71d3e
2010-09-14 13:01:08 -07:00
Jean-Baptiste Queru
0dfe1884ba
merge dd1d0016
to master
...
Change-Id: Ib83cd76a959fa6209f4920021d3dbf5d61fa6b8e
2010-09-14 09:52:29 -07:00
Ying Wang
f6332cfaf2
am b125c81c
: Refine the comment.
...
Merge commit 'b125c81cfcf9aea02c05f292c9eceb4e0bd66c87' into gingerbread-plus-aosp
* commit 'b125c81cfcf9aea02c05f292c9eceb4e0bd66c87':
Refine the comment.
2010-09-14 09:43:03 -07:00
Ying Wang
dd1d00163c
am 69de539a
: Add host modules needed by SDK build.
...
Merge commit '69de539a091bc035e0e2d67f2282450a6b4966bd' into gingerbread-plus-aosp
* commit '69de539a091bc035e0e2d67f2282450a6b4966bd':
Add host modules needed by SDK build.
2010-09-14 09:43:01 -07:00
Ying Wang
b125c81cfc
Refine the comment.
...
The host tools include script as well as native binaries.
Change-Id: I8bdd62bf5117ac71e2607d2cb4cd7b08bcbe7b14
2010-09-13 18:33:31 -07:00
Ying Wang
69de539a09
Add host modules needed by SDK build.
...
Since host module tag is defaulted to optional now, we have to explicitly
add those modules to the SDK product config file.
Change-Id: I8f6c4dcb17ef7716ae3590d6e96ddd5d07cc0582
2010-09-13 18:11:11 -07:00
Dmitry Shmidt
738dbba83d
Add "ip" utility to all builds
...
Change-Id: Iad392d127bd7f6ee014710a9c7479e3aaa92e743
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2010-09-13 16:54:37 -07:00
Andreas Huber
3e8f987889
am aeb2bbc1
: am 200f2598
: Build without OpenCore by default, remove obsolete opt-in to stagefright.
...
Merge commit 'aeb2bbc140acfbaa8279f704fd7fc3f4d08c9486'
* commit 'aeb2bbc140acfbaa8279f704fd7fc3f4d08c9486':
Build without OpenCore by default, remove obsolete opt-in to stagefright.
2010-08-30 13:30:29 -07:00
Andreas Huber
aeb2bbc140
am 200f2598
: Build without OpenCore by default, remove obsolete opt-in to stagefright.
...
Merge commit '200f25984ccc8a9e5fc13bfbcde22c17bc80d410' into gingerbread-plus-aosp
* commit '200f25984ccc8a9e5fc13bfbcde22c17bc80d410':
Build without OpenCore by default, remove obsolete opt-in to stagefright.
2010-08-30 13:06:50 -07:00
Andreas Huber
200f25984c
Build without OpenCore by default, remove obsolete opt-in to stagefright.
...
Change-Id: I6e08d2136147f4e279f8a5b2b3837e4317faf27c
related-to-bug: 2941153
2010-08-30 12:48:03 -07:00
Jean-Baptiste Queru
7cf1214093
Use all known locales in full build
...
Also use more audio files
Change-Id: Iab42123239c30012b0d918b5a4b484b5fc878faf
2010-08-10 09:51:47 -07:00
Christian Mehlmauer
5022d63cd2
Replaced AlarmClock with DeskClock
...
Change-Id: I1a9b9ce79b5b16709fe2d89638285633801b6d24
2010-07-23 20:09:54 +02:00
Xavier Ducrohet
2c6d410dac
Add SystemUi to the SDK build.
...
Change-Id: I84eb98c0b3fdaeb9e06c934ea5f4bdcf078cb7f1
2010-07-22 18:31:10 -07:00
The Android Open Source Project
79960bbaf0
am fa2d8ace
: merge from open-source master
...
Merge commit 'fa2d8ace56b8f7b150da3b86d00263a9266e9208'
* commit 'fa2d8ace56b8f7b150da3b86d00263a9266e9208':
Add full_x86 product.
2010-07-16 13:06:24 -07:00
The Android Open Source Project
fa2d8ace56
merge from open-source master
...
Change-Id: Ib0c0f02bb8fc87c3221fd9d2387a46b579a8ce40
2010-07-16 13:03:44 -07:00
Jean-Baptiste Queru
6c2df3e98b
Add full_x86 product.
...
By inheriting from full, this will be more self-maintaining, and
automatically gets a better-configured variant (e.g. it has locales,
a date format, etc...).
Change-Id: I67b6c2d9f9b7d20cb89154906c3f3d6a5391c838
2010-07-15 14:04:39 -07:00
James Dong
e63763087d
am 6f2bb44b
: am c1ab82ae
: Merge "Use stagefright (instead of OpenCore) authoring engine by default -rebased" into gingerbread
...
Merge commit '6f2bb44b4b3551738c429a25f99e42aca8913f4f'
* commit '6f2bb44b4b3551738c429a25f99e42aca8913f4f':
Use stagefright (instead of OpenCore) authoring engine by default
2010-06-24 11:59:12 -07:00
James Dong
6f2bb44b4b
am c1ab82ae
: Merge "Use stagefright (instead of OpenCore) authoring engine by default -rebased" into gingerbread
...
Merge commit 'c1ab82ae6b26d12cf6d5cdad1bd0ffc0d3acfb9b' into gingerbread-plus-aosp
* commit 'c1ab82ae6b26d12cf6d5cdad1bd0ffc0d3acfb9b':
Use stagefright (instead of OpenCore) authoring engine by default
2010-06-24 11:57:25 -07:00
James Dong
d891654b0c
Use stagefright (instead of OpenCore) authoring engine by default
...
-rebased
Change-Id: Ic184789eb4fb99b0e7cd5883bbe1267f903bc834
2010-06-24 09:53:35 -07:00
Andreas Huber
5f9168c0d5
am c55bb9ec
: am f2bab487
: Merge "Remove now unnecessary property overrides to opt into stagefright." into gingerbread
...
Merge commit 'c55bb9ecc92d34e448adec76bc06abdcd3c35f0e'
* commit 'c55bb9ecc92d34e448adec76bc06abdcd3c35f0e':
Remove now unnecessary property overrides to opt into stagefright.
2010-06-24 09:10:19 -07:00
Andreas Huber
c55bb9ecc9
am f2bab487
: Merge "Remove now unnecessary property overrides to opt into stagefright." into gingerbread
...
Merge commit 'f2bab487cc71a8a210ff98d21172d62edcaa6d2a' into gingerbread-plus-aosp
* commit 'f2bab487cc71a8a210ff98d21172d62edcaa6d2a':
Remove now unnecessary property overrides to opt into stagefright.
2010-06-24 09:08:43 -07:00
Andreas Huber
e3bbae0382
Remove now unnecessary property overrides to opt into stagefright.
...
Change-Id: I9810030e5576ac5a9cb31fcf0ce3f0baa96f6f40
related-to-bug: 2370115
2010-06-23 16:55:06 -07:00
Ying Wang
f9cd36a0f7
resolved conflicts for merge of 56791ebe
to master
...
Change-Id: I7463636796f1262fd92af839102dc58d562259f7
2010-06-15 15:43:13 -07:00
Ying Wang
56791ebe26
am c01cf7b9
: resolved conflicts for merge of 2b8d2383
to gingerbread
...
Merge commit 'c01cf7b9e6bda3f7e15aeda9cff03b6b41c5cba6' into gingerbread-plus-aosp
* commit 'c01cf7b9e6bda3f7e15aeda9cff03b6b41c5cba6':
Add a tapas command.
Rename is_unbundled_app_build and UNBUNDLED_APP_BUILD to TARGET_BUILD_APPS.
2010-06-15 15:17:42 -07:00
Ying Wang
c01cf7b9e6
resolved conflicts for merge of 2b8d2383
to gingerbread
...
Change-Id: I9174f843f0fde139a7d582f45b027f3face5c981
2010-06-15 15:11:51 -07:00
Joe Onorato
8aeb7cc461
am 2b8d2383
: Merge changes I02214abd,I79e6f60e into froyo
...
Merge commit '2b8d2383043a2b16e53538f9ebf123bfffd27ba1' into froyo-plus-aosp
* commit '2b8d2383043a2b16e53538f9ebf123bfffd27ba1':
Add a tapas command.
Rename is_unbundled_app_build and UNBUNDLED_APP_BUILD to TARGET_BUILD_APPS.
2010-06-15 14:24:42 -07:00
The Android Open Source Project
e18e4be361
am 9f431335
: merge from froyo-plus-aosp
...
Merge commit '9f431335ab377396713b8b386ad7539b2b28eff5'
* commit '9f431335ab377396713b8b386ad7539b2b28eff5':
generic.mk: Replaced AlarmClock with newer DeskClock App
2010-06-14 11:22:20 -07:00
The Android Open Source Project
9f431335ab
merge from froyo-plus-aosp
...
Change-Id: Ie8f2b137de580bfb23a1bdee513a8a20075e40a3
2010-06-14 11:21:00 -07:00
The Android Open Source Project
5cbd5d9ff4
merge from open-source master
...
Change-Id: I058f809f7e7eb69a757cb75f934a3630dfd7d777
2010-06-14 09:03:32 -07:00
Joe Onorato
16fa4b290e
Rename is_unbundled_app_build and UNBUNDLED_APP_BUILD to TARGET_BUILD_APPS.
...
Change-Id: I79e6f60e009dad3a48709962347441e4ca0c337a
2010-06-10 18:38:25 -07:00
Joe Onorato
7a0b78b6b9
am a65ecab3
: am 13a90e3a
: Add SystemUI.apk to the generic build.
2010-06-02 22:41:24 -07:00
Joe Onorato
13a90e3a20
Add SystemUI.apk to the generic build.
...
Change-Id: I03d92d93fbcb51808a096fb7d48c1b693efa777d
2010-06-02 14:48:35 -07:00
Ying Wang
f33c3ef933
am b93e03cb
: am 52911309
: Cherry-pick unbundled build changes from master
...
Merge commit 'b93e03cbc9d47a9d9a385c780ed64639e2a23ae5' into kraken
* commit 'b93e03cbc9d47a9d9a385c780ed64639e2a23ae5':
Cherry-pick unbundled build changes from master
2010-06-02 13:11:32 -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
d5f3db8a1f
am eae2720b
: am 3a212f0f
: am 0c5363c8
: am 8e5605a7
: Add QuickSearchBox to the SDK build.
2010-05-26 11:42:46 -07:00
Xavier Ducrohet
3a212f0fb6
am 0c5363c8
: am 8e5605a7
: Add QuickSearchBox to the SDK build.
...
Merge commit '0c5363c8571eef11eeb21a575da941565c34191e' into kraken
* commit '0c5363c8571eef11eeb21a575da941565c34191e':
Add QuickSearchBox to the SDK build.
2010-05-25 17:50:43 -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
Andreas Huber
c677db71e8
am 3388f183
: am 588d529e
: Merge "Make Vorbis decoding through stagefright the default." into kraken
2010-05-25 14:19:17 -07:00
Andreas Huber
1c180a05c7
Make Vorbis decoding through stagefright the default.
...
Change-Id: I4273b766024f5363fdd05c3d30d0c71209679950
2010-05-25 12:27:03 -07:00
Christian Mehlmauer
8056ee21f0
generic.mk: Replaced AlarmClock with newer DeskClock App
...
Change-Id: I2afe4876b1dd7e9e9200e27ba64eebe4a34065fb
2010-05-22 22:22:26 +02:00
Ying Wang
1a031e411e
Support for unbundled app build
...
With this CL, run "make APP-{appname}" to build unbundled app in
the unbundled app src tree.
See http://b/issue?id=2667113
Change-Id: I1d753db795142508bc841ae66b4408220ab687c5
2010-05-19 17:07:00 -07:00
The Android Open Source Project
cefd298d8a
am bc2f9318
: am 57b44e52
: am bc12cd04
: merge from open-source master
2010-05-14 16:13:29 -07:00
The Android Open Source Project
57b44e5287
am bc12cd04
: merge from open-source master
...
Merge commit 'bc12cd04b878a9c3520abd21600c2078c930adc3' into kraken
* commit 'bc12cd04b878a9c3520abd21600c2078c930adc3':
Use a different kernel boot line for the disk installer.
Use a property to enable the eth0 LAN port on the emulator
2010-05-14 15:54:09 -07:00
The Android Open Source Project
bc12cd04b8
merge from open-source master
...
Change-Id: I0dd123dde8f0da42a99313cffed6a48d30e38381
2010-05-14 15:52:50 -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
The Android Open Source Project
eaf130ec2c
am 58248935
: am cf28b803
: am ae4e1455
: merge from open-source master
2010-05-03 16:16:25 -07:00
The Android Open Source Project
cf28b80398
am ae4e1455
: merge from open-source master
...
Merge commit 'ae4e14556bb3a789c4263ebba7ed42b3035e13f6' into kraken
* commit 'ae4e14556bb3a789c4263ebba7ed42b3035e13f6':
Adapt to new location of libcore
Make expr more POSIXy
generic_x86 support
Remove obsolete machine-setup.html reference.
2010-05-03 16:13:22 -07:00
The Android Open Source Project
ae4e14556b
merge from open-source master
...
Change-Id: I3d24628d38c99369f242733d9089d7c5669a4623
2010-05-03 16:11:04 -07:00
Bruce Beare
c25e503207
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>
2010-04-28 16:52:51 -07:00
Elliott Hughes
6b5635e446
Make a full list of locales available, and use it for the sim build.
...
Bug: 2498876
Change-Id: I59b8d851c6cd242d199c189f3e3dfde9baf3e6e0
2010-04-26 10:49:43 -07:00
Jean-Baptiste Queru
1c75692147
am 488891d8
: Merge "Replace AlarmClock with DeskClock in the SDK" into kraken
2010-04-20 11:06:45 -07:00
Jean-Baptiste Queru
a454d328bc
Replace AlarmClock with DeskClock in the SDK
...
Change-Id: I82a8fe1b1fbea78acde5ad61dc595fe8272377bc
2010-04-19 09:38:42 -07:00