Commit Graph

293 Commits

Author SHA1 Message Date
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 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
Ying Wang 04e1f31dfd Move videoeditor libraries to generic_no_telephony.mk.
Change-Id: I8ea2058b79ccfda3114ba64b4e43c175a0fe086c
2011-01-19 10:28:05 -08:00
Xavier Ducrohet a17fe58b46 Update SDK app list.
Change-Id: I1a99b0bd716f90688aea9b9db20e393a91ad8ad2
2011-01-18 10:10:32 -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
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
Jason parks a1e48dc30f Add the CryptKeeper to the build.
Change-Id: I094c5f24cd7f9f1241d301984badd15b38eef33a
2011-01-05 14:51:42 -06:00
Jean-Baptiste Queru 229c35eed4 am 41c423da: am 96d3e9b3: Merge "generic_x86 builds don\'t need/use the sparse ext4 format."
* commit '41c423da9df557b87e8db490b3ed4d4b34470423':
  generic_x86 builds don't need/use the sparse ext4 format.
2010-12-29 16:02:14 -08:00
Jean-Baptiste Queru 9326ab155e am 827c662d: am e28ae87a: Merge "Use ext4 file system for generic_x86 userdata partition"
* commit '827c662d8f145e5a0492838c951dad5d96716c71':
  Use ext4 file system for generic_x86 userdata partition
2010-12-29 16:02:12 -08:00
Jean-Baptiste Queru fb6172cf7b am 4bd05717: am 670ccf2c: Merge "GB Updates for init.rc and boot command line"
* commit '4bd05717e2156a0eeb9de81de3e8595b560f2627':
  GB Updates for init.rc and boot command line
2010-12-29 16:02:09 -08:00
Bruce Beare 4c0115d0b7 generic_x86 builds don't need/use the sparse ext4 format.
Change-Id: I62973b131a728c3862be4642e2d49d0fa61555ac
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
2010-12-28 15:33:27 -08:00
Bruce Beare 1e906eff26 Use ext4 file system for generic_x86 userdata partition
Change-Id: I05710c2bda521b35712513bc219fc73ed00e4617
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
2010-12-28 14:48:24 -08:00
Bruce Beare 5f276fff11 GB Updates for init.rc and boot command line
Change-Id: I0638c8834fccbdc94ec99e7592a75b6972cb53b8
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
2010-12-28 14:48:23 -08: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 cbc0f4442e Delete the tuttle keymaps.
These files have been obsolete for years.

Change-Id: I489d22799dd0fd476b6afe296e24434d437ea75b
2010-11-23 16:48:26 -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