OSDN Git Service
Ying Wang [Mon, 20 Dec 2010 19:40:33 +0000 (11:40 -0800)]
am
099fecd7: Use PRIVATE_CXX in HOST modules.
* commit '
099fecd759ce54168fe4094880d1ca748e8906b9':
Use PRIVATE_CXX in HOST modules.
Ying Wang [Mon, 20 Dec 2010 19:18:28 +0000 (11:18 -0800)]
Use PRIVATE_CXX in HOST modules.
This fixes the build error:
out/host/linux-x86/obj/SHARED_LIBRARIES/libneo_util_intermediates/neo_err.o:
file not recognized: File format not recognized
See also CL #84578
Change-Id: Ib91230c7a5c9809eb1935959eaa9be8fa7c596b9
Jean-Baptiste Queru [Thu, 16 Dec 2010 23:43:46 +0000 (15:43 -0800)]
Ignore
9bfb8142 from gingerbread
Change-Id: Ie0ec4fc224d23516906b9ca750c5200aa7fbf63c
Jeff Hamilton [Thu, 16 Dec 2010 00:29:40 +0000 (18:29 -0600)]
DO NOT MERGE: The API version changed and a bunch of stuff needs rebuilding, so just wipe $(OUT_DIR).
Change-Id: I7b6c291db3ec09c7b53949a04cc792912004a1de
Jean-Baptiste Queru [Wed, 15 Dec 2010 00:23:19 +0000 (16:23 -0800)]
resolved conflicts for merge of
76aa8d0a to gingerbread-plus-aosp
Change-Id: I7fa43d5b5d52b68baca3e4848cd308fea1d1fb98
Jean-Baptiste Queru [Wed, 15 Dec 2010 00:16:44 +0000 (16:16 -0800)]
update API version to 9
Change-Id: Ia573996bb910e19c8f7017ca13cf9d9d77083404
Jean-Baptiste Queru [Wed, 15 Dec 2010 00:11:06 +0000 (16:11 -0800)]
resolved conflicts for merge of
c1b33081 to gingerbread-plus-aosp - DO NOT MERGE
Change-Id: I785e36efe89cc11e2dacfb4a30901be93453f221
Dianne Hackborn [Tue, 14 Dec 2010 19:30:43 +0000 (11:30 -0800)]
(DO NOT MERGE) Issue #
3255640: Need to bump GB to API 10 version name "2.4"
We are now version 2.4, API 10.
Change-Id: I5876ee7cdd1c6e4115dbe79d426f678e8d354449
David 'Digit' Turner [Tue, 14 Dec 2010 10:42:10 +0000 (02:42 -0800)]
am
15f4980d: Merge "Add support for custom Linux host toolchains when building the SDK." into gingerbread
* commit '
15f4980d510824113a4d2b71d70de9c67715f3dc':
Add support for custom Linux host toolchains when building the SDK.
David 'Digit' Turner [Tue, 14 Dec 2010 10:37:05 +0000 (02:37 -0800)]
Merge "Add support for custom Linux host toolchains when building the SDK." into gingerbread
David 'Digit' Turner [Fri, 10 Dec 2010 21:24:06 +0000 (22:24 +0100)]
Add support for custom Linux host toolchains when building the SDK.
This is needed in order to build Linux SDK binaries that can run
properly on Ubuntu 8.04 (Hardy). By default, the host toolchain
on 10.04 (Lucid) generates machine code that won't run on Hardy
due to GLibc ABI mistmatches.
Note that nothing happens if the new toolchain is not in the
prebuilt tree.
Change-Id: I45c1f68e37e15a0032f885df1c5c0f297b3d8642
Ying Wang [Sat, 11 Dec 2010 00:21:43 +0000 (16:21 -0800)]
am
c7973678: Merge "Default uninstallable modules\' tag to optional" into gingerbread
* commit '
c79736785716d56768998d64317ff90a62073868':
Default uninstallable modules' tag to optional
Ying Wang [Sat, 11 Dec 2010 00:17:59 +0000 (16:17 -0800)]
Merge "Default uninstallable modules' tag to optional" into gingerbread
Ying Wang [Fri, 10 Dec 2010 19:17:28 +0000 (11:17 -0800)]
Default uninstallable modules' tag to optional
Change-Id: I31faee42c807b3b6d7b85feea6c74860c89d45de
Jean-Baptiste Queru [Fri, 10 Dec 2010 16:58:22 +0000 (08:58 -0800)]
am
2562a40e: reconcile with open-source gingerbread
* commit '
2562a40eb1afa88e8e3b97fb4c96f2241d28ec1e':
Jean-Baptiste Queru [Fri, 10 Dec 2010 16:55:53 +0000 (08:55 -0800)]
Ignore
0c3d5d95 from gingerbread
Version number changes don't merge across codelines
Change-Id: I97e65e0ced9158da86568a32dc08f133755b9267
Jean-Baptiste Queru [Fri, 10 Dec 2010 16:05:23 +0000 (08:05 -0800)]
Jean-Baptiste Queru [Fri, 10 Dec 2010 16:01:07 +0000 (08:01 -0800)]
Merge from gingerbread
Change-Id: Icfc2bb041b1360a8a0258d7de5547fded86bf7ec
Jean-Baptiste Queru [Fri, 10 Dec 2010 15:46:16 +0000 (07:46 -0800)]
reconcile with open-source gingerbread
Change-Id: I817f61141bf2c5189b13965ea9f3ead8f19d61cb
android-merger [Thu, 9 Dec 2010 18:50:19 +0000 (10:50 -0800)]
2.3.1
Change-Id: I9096a5b7a8e85274cac23d88635d3f49e6698cd8
android-merger [Thu, 9 Dec 2010 18:50:19 +0000 (10:50 -0800)]
2.3.1
Change-Id: I64c7f35bb6cdfdfef01ce396798a0235642c0486
Jean-Baptiste Queru [Mon, 6 Dec 2010 23:12:02 +0000 (15:12 -0800)]
am
3ef1d674: am
4985f06f: Merge "Make image-size-from-data-size not use hard coded values."
* commit '
3ef1d674806734c2e237a54815ea5c077ce8c344':
Make image-size-from-data-size not use hard coded values.
Jean-Baptiste Queru [Mon, 6 Dec 2010 23:10:35 +0000 (15:10 -0800)]
am
4985f06f: Merge "Make image-size-from-data-size not use hard coded values."
* commit '
4985f06f4e96351c77b88b20bc9ded65daefcd3e':
Make image-size-from-data-size not use hard coded values.
Jean-Baptiste Queru [Mon, 6 Dec 2010 22:58:08 +0000 (14:58 -0800)]
Merge "Make image-size-from-data-size not use hard coded values."
Lars Svensson [Mon, 6 Dec 2010 14:24:58 +0000 (15:24 +0100)]
Make image-size-from-data-size not use hard coded values.
The function image-size-from-data-size was using hard
coded values. The size of spare area and pages has become
configurable so we need to read from the variables.
Change-Id: I9461d34400ffc2cc5920860d8aa78750d559e397
Scott Main [Mon, 6 Dec 2010 03:04:18 +0000 (19:04 -0800)]
Scott Main [Mon, 6 Dec 2010 02:03:23 +0000 (18:03 -0800)]
docs: fix link
Change-Id: Id57ebbd12c16ef914ebe1d90260fdf8a5ae4587b
Sriram Raman [Tue, 30 Nov 2010 19:45:14 +0000 (11:45 -0800)]
am
c647aeca: Add mkuserimg.sh, make_ext4fs to otatools
* commit '
c647aecabb9cf03d73cfc34836e3bfc886b54c2e':
Add mkuserimg.sh, make_ext4fs to otatools
Sriram Raman [Mon, 29 Nov 2010 23:51:20 +0000 (18:51 -0500)]
Add mkuserimg.sh, make_ext4fs to otatools
Change-Id: Id48d6643f4579d695685fe2595bd86a80a5083c3
Jean-Baptiste Queru [Wed, 24 Nov 2010 17:33:25 +0000 (09:33 -0800)]
am
d2dd8652: Merge "Added generic hook for loading vendor specific tasks."
* commit '
d2dd86529982cd05b4010248cea368fbef763ef2':
Added generic hook for loading vendor specific tasks.
Jean-Baptiste Queru [Wed, 24 Nov 2010 17:23:35 +0000 (09:23 -0800)]
Merge "Added generic hook for loading vendor specific tasks."
Claes Elgemark [Fri, 12 Nov 2010 14:46:00 +0000 (15:46 +0100)]
Added generic hook for loading vendor specific tasks.
With this change it is possible for vendors to create rules that depend on
targets defined in Android.mk files.
This makes it easier to decouple functionality from the core buildsystem.
Very much as is done within the build git for tasks like creating SDK addon,
Generating eclipse .classpath file etc can then be done for vendors as well.
You can add targets that could perform poststeps on produced modules.
E.g. Do static verification or documentation on modules of a certain type.
You can e.g. create a target that would resign and upload all apks to a
binary repository.
Change-Id: Ic0fa7b60b919ede3c59fa2885d1fd4be1e928c04
Jean-Baptiste Queru [Tue, 23 Nov 2010 18:51:44 +0000 (10:51 -0800)]
am
7fbeda2b: Merge "Adding `all\' to INTERNAL_MODIFIER_TARGETS to fix `make all\'"
* commit '
7fbeda2b1ed2872b2e2ab2f7faf386a3755502df':
Adding `all' to INTERNAL_MODIFIER_TARGETS to fix `make all'
Jean-Baptiste Queru [Tue, 23 Nov 2010 18:37:08 +0000 (10:37 -0800)]
Merge "Adding `all' to INTERNAL_MODIFIER_TARGETS to fix `make all'"
Magnus Bäck [Mon, 8 Nov 2010 12:44:02 +0000 (13:44 +0100)]
Adding `all' to INTERNAL_MODIFIER_TARGETS to fix `make all'
Commit
e334d255 added the `all' pseudo-goal (aka internal modifier
target) to have make dex all Java modules. Unfortunately the new
pseudo-goal wasn't added to INTERNAL_MODIFIER_TARGETS so no actual
phony goal was added, resulting in the obvious
make: *** No rule to make target `all'. Stop.
error message when running `make all'. This commit changes
INTERNAL_MODIFIER_TARGETS to also include `all' so that the
pseudo-goal is treated just like `showcommands' and `checkbuild'.
Change-Id: I7905c1e27d1b17bdc1b4331744bf06e18937406f
Jean-Baptiste Queru [Fri, 19 Nov 2010 20:35:33 +0000 (12:35 -0800)]
resolved conflicts for merge of
b2028868 to gingerbread-plus-aosp
Change-Id: Ibe616c0bdf8e36aaee42279292a2dbe03c5643c2
Jean-Baptiste Queru [Fri, 19 Nov 2010 19:15:56 +0000 (11:15 -0800)]
Merge "IA: enable SSE fpmath, Separate ARCH_VARIANT and ARCH makefile settings"
Bruce Beare [Thu, 14 Oct 2010 21:12:46 +0000 (14:12 -0700)]
IA: enable SSE fpmath, Separate ARCH_VARIANT and ARCH makefile settings
Change-Id: I60b8121c92b39a60b513bc2496a1e0a21015c586
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Jean-Baptiste Queru [Fri, 19 Nov 2010 19:15:19 +0000 (11:15 -0800)]
am
493306f7: Merge "Fix TARGET_PREBUILT_TAG so that get_build_var can retrieve the correct value across architectures"
* commit '
493306f7c318d632186bebd732708d4299e66a62':
Fix TARGET_PREBUILT_TAG so that get_build_var can retrieve the correct value across architectures
Jean-Baptiste Queru [Fri, 19 Nov 2010 19:01:22 +0000 (11:01 -0800)]
Merge "Fix TARGET_PREBUILT_TAG so that get_build_var can retrieve the correct value across architectures"
Jean-Baptiste Queru [Fri, 19 Nov 2010 18:58:11 +0000 (10:58 -0800)]
resolved conflicts for merge of
4130c80a to gingerbread-plus-aosp
Change-Id: I4c37c4a6a54c3fb005eec4789bfcf96678d8cec9
Jean-Baptiste Queru [Fri, 19 Nov 2010 18:45:27 +0000 (10:45 -0800)]
Merge "Correct makefile test for stagefright build"
Bruce Beare [Thu, 14 Oct 2010 21:14:17 +0000 (14:14 -0700)]
Correct makefile test for stagefright build
Change-Id: Ia79b97d43e3fad82491e7d6197ffef2e764a63e3
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Jean-Baptiste Queru [Fri, 19 Nov 2010 18:37:07 +0000 (10:37 -0800)]
am
26d8c589: Merge "Display the TARGET_ARCH_VARIANT"
* commit '
26d8c5896e937ed677007c23d46d6759845fe91f':
Display the TARGET_ARCH_VARIANT
Jean-Baptiste Queru [Fri, 19 Nov 2010 18:29:14 +0000 (10:29 -0800)]
Merge "Display the TARGET_ARCH_VARIANT"
Ying Wang [Fri, 19 Nov 2010 18:24:57 +0000 (10:24 -0800)]
am
b26a65b5: Merge "Restrict make version to 3.81"
* commit '
b26a65b59ff5ed777accaf34ac06ab6a86dc37c6':
Restrict make version to 3.81
Ying Wang [Thu, 18 Nov 2010 19:20:21 +0000 (11:20 -0800)]
Merge "Restrict make version to 3.81"
Ying Wang [Thu, 18 Nov 2010 18:32:12 +0000 (10:32 -0800)]
Restrict make version to 3.81
Bug:
3209290
It turns out that gmake 3.82 on Mac OSX crashes with segmentation fault
at some point.
Change-Id: I7b632abe1cafc5f0ff2ea45611d8ccf0aa3f976a
Jean-Baptiste Queru [Wed, 17 Nov 2010 23:27:13 +0000 (15:27 -0800)]
am
48ec6d6f: Merge "Enables x86-atom as a valid TARGET_ARCH_VARIANT for the simulator build."
* commit '
48ec6d6f814a70068c4632b468cd7872f34295ad':
Enables x86-atom as a valid TARGET_ARCH_VARIANT for the simulator build.
Jean-Baptiste Queru [Wed, 17 Nov 2010 23:15:32 +0000 (15:15 -0800)]
Merge "Enables x86-atom as a valid TARGET_ARCH_VARIANT for the simulator build."
Johnnie Birch [Mon, 2 Aug 2010 19:12:15 +0000 (12:12 -0700)]
Enables x86-atom as a valid TARGET_ARCH_VARIANT for the simulator build.
Change-Id: Idbceb6c7d4117fbecd35e4261330e6405666189e
Xavier Ducrohet [Thu, 11 Nov 2010 22:59:57 +0000 (14:59 -0800)]
am
01a9840b: Merge "Rename layoutlib_utils into ide_common"
* commit '
01a9840ba7545d9175575cc3d95b2584b2dee31c':
Rename layoutlib_utils into ide_common
Xavier Ducrohet [Thu, 11 Nov 2010 22:45:05 +0000 (14:45 -0800)]
Merge "Rename layoutlib_utils into ide_common"
Xavier Ducrohet [Thu, 11 Nov 2010 20:44:16 +0000 (12:44 -0800)]
Rename layoutlib_utils into ide_common
Change-Id: Iaa8275881dd1ee7d41c30f8b0d481253a6635271
Scott Main [Tue, 9 Nov 2010 01:10:25 +0000 (17:10 -0800)]
am
badffa84: docs: revise intro to reflect changes to quick start
* commit '
badffa84327de8154ea3ba96dcf908478c4d4a17':
docs: revise intro to reflect changes to quick start
Scott Main [Mon, 8 Nov 2010 20:28:14 +0000 (12:28 -0800)]
docs: revise intro to reflect changes to quick start
Change-Id: I0fdc13344831960d3fb82f80d5e391186117fc5c
Scott Main [Sat, 6 Nov 2010 21:21:16 +0000 (14:21 -0700)]
am
c775c754: docs: add gingerbread logo for homepage
* commit '
c775c754f13bd54b7d5da8c28186cdd8167dc53a':
docs: add gingerbread logo for homepage
Scott Main [Fri, 5 Nov 2010 21:29:07 +0000 (14:29 -0700)]
docs: add gingerbread logo for homepage
Change-Id: I54db7009931e1ec5688d4f473a520a4f61db598a
Scott Main [Fri, 5 Nov 2010 20:57:15 +0000 (13:57 -0700)]
am
ec97fd30: docs: revisions to ndk download intro
* commit '
ec97fd30a6af6d954f156620a69c29352e012d39':
docs: revisions to ndk download intro
Robert Ly [Fri, 5 Nov 2010 20:57:10 +0000 (13:57 -0700)]
am
706e41e5: Update the template text for the NDK download page to point to new links
* commit '
706e41e55f2e3b456c51b56ba07d1dfd56716af9':
Update the template text for the NDK download page to point to new links
Scott Main [Fri, 5 Nov 2010 04:02:14 +0000 (21:02 -0700)]
docs: revisions to ndk download intro
Change-Id: Ib1ba3d5f0e727a1246dc92161b72bcfff6f9d772
Robert Ly [Wed, 3 Nov 2010 01:35:43 +0000 (18:35 -0700)]
Update the template text for the NDK download page to point to new
links
Change-Id: Icb1571eae18dcd9f9f86c5fd855f15783f9d4ae4
Jean-Baptiste Queru [Thu, 4 Nov 2010 14:24:48 +0000 (07:24 -0700)]
Merge
7b393fd1 from open-source master
Change-Id: I5fee3ccbf7845d087e72848b4cec0198cd4afc26
Jean-Baptiste Queru [Wed, 3 Nov 2010 17:29:55 +0000 (10:29 -0700)]
Merge "Add version_defaults.mk to be a prerequisite of build.prop"
Chih-Wei Huang [Wed, 3 Nov 2010 10:33:46 +0000 (18:33 +0800)]
Add version_defaults.mk to be a prerequisite of build.prop
The version_defaults.mk defines variables that may affect
the content of build.prop.
Change-Id: Iabb82459949bb6e7a91829c5b485aad331c50b72
Jean-Baptiste Queru [Tue, 2 Nov 2010 21:17:54 +0000 (14:17 -0700)]
am
892ea1ea: Merge "build: Add spare size flag to mkyaffs2image"
* commit '
892ea1eaadfa5b57948bb66bd3432e06c58188e1':
build: Add spare size flag to mkyaffs2image
Jean-Baptiste Queru [Tue, 2 Nov 2010 16:01:30 +0000 (09:01 -0700)]
Merge "build: Add spare size flag to mkyaffs2image"
Naseer Ahmed [Fri, 6 Aug 2010 19:19:29 +0000 (12:19 -0700)]
build: Add spare size flag to mkyaffs2image
Change-Id: Ib3a915ba5296d31f88cdc81e13da02f281dbdb9f
Scott Main [Tue, 2 Nov 2010 03:21:39 +0000 (20:21 -0700)]
am
2e94aa25: docs: make the resizable side nav standard. DO NOT MERGE. This actually affects only the SDK tab, which previously did not allow resizing---now it does. Also add a couple new templates to allow either 190 or 200 pixel-wide side navigation by default, and
* commit '
2e94aa25d458e96d6503b88c52e81c65fb34a9d0':
docs: make the resizable side nav standard. DO NOT MERGE. This actually affects only the SDK tab, which previously did not allow resizing---now it does. Also add a couple new templates to allow either 190 or 200 pixel-wide side navigation by default, and apply 200 to the Resources tab.
Scott Main [Mon, 1 Nov 2010 22:51:49 +0000 (15:51 -0700)]
docs: make the resizable side nav standard. DO NOT MERGE.
This actually affects only
the SDK tab, which previously did not allow resizing---now it does.
Also add a couple new templates to allow either 190 or 200 pixel-wide
side navigation by default, and apply 200 to the Resources tab.
Change-Id: I4555c496088dd8aac77f9aa01273c3a1d52f89e0
Scott Main [Mon, 1 Nov 2010 17:53:08 +0000 (10:53 -0700)]
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
Scott Main [Mon, 1 Nov 2010 17:49:07 +0000 (10:49 -0700)]
Merge "docs: update sdk download template DO NOT MERGE add windows installer and revise a bit else" into gingerbread
Raphael Moll [Sat, 30 Oct 2010 02:03:49 +0000 (19:03 -0700)]
am
4aa7a190: Merge "Fix "make acp" under Cygwin. DO NOT MERGE."
* commit '
4aa7a190bb81b7e3ad12d53b83908c3c72745f6e':
Fix "make acp" under Cygwin. DO NOT MERGE.
Raphael Moll [Sat, 30 Oct 2010 01:53:07 +0000 (18:53 -0700)]
Merge "Fix "make acp" under Cygwin. DO NOT MERGE."
Jean-Baptiste Queru [Fri, 29 Oct 2010 15:16:49 +0000 (08:16 -0700)]
am
6a514dcc: am
16bf5290: (-s ours) Merge from AOSP froyo. Do not merge.
* commit '
6a514dcc9d7d851d5cbe95ef7603d2bf0523a6a2':
CTS vm-tests now depend on hosttestlib.
Jean-Baptiste Queru [Fri, 29 Oct 2010 12:51:54 +0000 (05:51 -0700)]
am
16bf5290: (-s ours) Merge from AOSP froyo. Do not merge.
* commit '
16bf5290b1c8fcedda6c376db64f2bacbaf2c7a4':
CTS vm-tests now depend on hosttestlib.
Jean-Baptiste Queru [Fri, 29 Oct 2010 12:45:56 +0000 (05:45 -0700)]
Merge from AOSP froyo. Do not merge.
CTS vm-tests now depend on hosttestlib.
Change-Id: Ie252227825ccb843b4be1205e3b135b7535b8a03
Scott Main [Thu, 28 Oct 2010 05:35:24 +0000 (22:35 -0700)]
docs: update sdk download template DO NOT MERGE
add windows installer and revise a bit else
Change-Id: Ie0ea7765d797cb54ee1d7fc733ec6db4fdedac3a
Raphael Moll [Thu, 28 Oct 2010 02:06:12 +0000 (19:06 -0700)]
Fix "make acp" under Cygwin. DO NOT MERGE.
Change-Id: I52ae8d4835b27a712d4795e7f41fa9ca4f3a822d
Brett Chabot [Thu, 28 Oct 2010 01:56:53 +0000 (18:56 -0700)]
am
ebf4b519: cherry pick \'CTS vm-tests depend on hostestlib\' into GB.
Brett Chabot [Thu, 28 Oct 2010 01:49:33 +0000 (18:49 -0700)]
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
Jean-Baptiste Queru [Wed, 27 Oct 2010 21:59:39 +0000 (14:59 -0700)]
Merge "CTS vm-tests now depend on hosttestlib." into froyo
Brett Chabot [Wed, 27 Oct 2010 01:55:56 +0000 (18:55 -0700)]
CTS vm-tests now depend on hosttestlib.
Bug
3125713
Change-Id: I5774df2abeff7dd82e1218138d1ea3b25edd0901
Scott Main [Tue, 26 Oct 2010 00:22:50 +0000 (17:22 -0700)]
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.
Scott Main [Tue, 26 Oct 2010 00:14:24 +0000 (17:14 -0700)]
docs: css tweak to Ps in sidebox. DO NOT MERGE.
Change-Id: Ifa3e4a9a2c2ba67b6da615ebc336c897dd9caeda
Jean-Baptiste Queru [Sun, 24 Oct 2010 20:31:17 +0000 (13:31 -0700)]
Set defauilt ringtone and default notification in full builds
Change-Id: Ia5c76d393d428dffc72cb8440720fa0f0884e401
Jean-Baptiste Queru [Sat, 23 Oct 2010 01:56:30 +0000 (18:56 -0700)]
Use the new list of all audio files
Change-Id: Ic510c243dde616cca3374f6aa6a2835690cf6818
Jean-Baptiste Queru [Fri, 22 Oct 2010 23:13:02 +0000 (16:13 -0700)]
Minor cleanup - DO NOT MERGE
Change-Id: I0fc4e3c45ae5a545f1a02ed974bc3c7500286e22
Jean-Baptiste Queru [Fri, 22 Oct 2010 21:41:55 +0000 (14:41 -0700)]
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
Ying Wang [Fri, 22 Oct 2010 21:14:59 +0000 (14:14 -0700)]
Switch Unbundled apps from generic.mk to full.mk.
Change-Id: I7aaaef8f2032590d55ccec77621c6b3f4c121f9a
Jean-Baptiste Queru [Fri, 22 Oct 2010 19:34:32 +0000 (12:34 -0700)]
Fix list of locales (bad country codes).
DA->DK, SV->SE
Change-Id: I7bc7f64905ecd583e1a7ca5b43a8fffd5f3ba383
Jean-Baptiste Queru [Fri, 22 Oct 2010 17:22:42 +0000 (10:22 -0700)]
Make a full list of locales available
Use it for the sim build and full build.
Change-Id: I64dfa7ac1b374529ef5f0c1460dd35171311115e
Jean-Baptiste Queru [Fri, 22 Oct 2010 16:52:09 +0000 (09:52 -0700)]
Truly default to the full config.
It is much better than generic for emulator-based work.
Change-Id: I8b69b208bc4969d3f95c3467ca6737de8fd9460d
Ying Wang [Wed, 20 Oct 2010 21:28:52 +0000 (14:28 -0700)]
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.
Ying Wang [Wed, 20 Oct 2010 21:01:09 +0000 (14:01 -0700)]
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
Jean-Baptiste Queru [Tue, 19 Oct 2010 22:19:45 +0000 (15:19 -0700)]
resolved conflicts for merge of
54ddcc27 to gingerbread-plus-aosp
Change-Id: I336f9e6859dce3bb18224b3340837474319c809c
Jean-Baptiste Queru [Tue, 19 Oct 2010 21:43:38 +0000 (14:43 -0700)]
Merge "Explicitly declare assembly only __ASSEMBLY__ macro for assembly source"
Jean-Baptiste Queru [Mon, 18 Oct 2010 22:39:59 +0000 (15:39 -0700)]
Ignore
8cd38383 from gingerbread
Change-Id: I6414756b09317f0131ac443bf4b1acad82a2574b
Dianne Hackborn [Mon, 18 Oct 2010 18:46:50 +0000 (11:46 -0700)]
Gingerbread becomes real.
Change-Id: I20668ef8a9221b802d785e9c8ea1b6b882f828ac
Scott Main [Sat, 16 Oct 2010 01:22:09 +0000 (18:22 -0700)]
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.