OSDN Git Service

android-x86/build.git
13 years agoClean up full config - DO NOT MERGE
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: I7f8254bf8c1177594fbdfbdb082bdc429a4a5b25
Orig-Change-Id: Ieb1f4ed47988c8fff119ff53f1f374032da3752d

13 years agoMake a full list of locales available
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: I0050f9ee10aafa96cb89cad5d3f492bb1839e331
Orig-Change-Id: I64dfa7ac1b374529ef5f0c1460dd35171311115e

13 years agoTruly default to the full config.
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.

Orig-Change-Id: I8b69b208bc4969d3f95c3467ca6737de8fd9460d

13 years agogeneric_x86 builds don't need/use the sparse ext4 format.
Bruce Beare [Tue, 28 Dec 2010 23:33:22 +0000 (15:33 -0800)]
generic_x86 builds don't need/use the sparse ext4 format.

Orig-Change-Id: I62973b131a728c3862be4642e2d49d0fa61555ac
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
13 years agoUse ext4 file system for generic_x86 userdata partition
Bruce Beare [Mon, 27 Dec 2010 21:05:23 +0000 (13:05 -0800)]
Use ext4 file system for generic_x86 userdata partition

Orig-Change-Id: I05710c2bda521b35712513bc219fc73ed00e4617
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
13 years agoGB Updates for init.rc and boot command line
David 'Digit' Turner [Mon, 13 Jun 2011 21:43:02 +0000 (23:43 +0200)]
GB Updates for init.rc and boot command line

Change-Id: Iae0f5b1eda109f99be6c484082abebc7b51adf51
Orig-Change-Id: I0638c8834fccbdc94ec99e7592a75b6972cb53b8
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
13 years agoFix TARGET_PREBUILT_TAG so that get_build_var can retrieve the correct value across...
Bruce Beare [Tue, 31 May 2011 19:52:06 +0000 (12:52 -0700)]
Fix TARGET_PREBUILT_TAG so that get_build_var can retrieve the correct value across architectures

Orig-Change-Id: I5c1010d9caaa8d9ffaf65999fa3649c3c2be8caa
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
13 years agoDisplay the TARGET_ARCH_VARIANT
Bruce Beare [Thu, 14 Oct 2010 19:21:58 +0000 (12:21 -0700)]
Display the TARGET_ARCH_VARIANT

Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
13 years agoAdd generic_x86-eng to the lunch menu
Bruce Beare [Tue, 31 May 2011 19:50:27 +0000 (12:50 -0700)]
Add generic_x86-eng to the lunch menu

Orig-Change-Id: Ie4e0f9054c5bc6ad8845b5b885a00174dd8c9534
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
13 years agoMove buildspec vars to BoardConfig.mk
Bruce Beare [Mon, 12 Jul 2010 18:32:37 +0000 (11:32 -0700)]
Move buildspec vars to BoardConfig.mk

Orig-Change-Id: I48ed4b55e91aae51076d9c609b44bf9fa24c3ecd
Signed-off-by: Bruce Beare <brucex.j.beare@intel.com>
13 years agoVendorsetup needs to look in additional places.
Bruce Beare [Tue, 31 May 2011 19:47:58 +0000 (12:47 -0700)]
Vendorsetup needs to look in additional places.

Orig-Change-Id: I698856f8e02487322540e804c038bba28cc23532
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
13 years agoAllow TARGET_ARCH to be set from BoardConfig.mk
Bruce Beare [Tue, 31 May 2011 18:03:09 +0000 (11:03 -0700)]
Allow TARGET_ARCH to be set from BoardConfig.mk

Orig-Change-Id: I66aed78b763d238719822257c1f4f35301247df6
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
13 years agoRefactor Stripper. Allow a stripper other than SOSLIM to be specified
Bruce Beare [Tue, 31 May 2011 17:40:20 +0000 (10:40 -0700)]
Refactor Stripper. Allow a stripper other than SOSLIM to be specified

Orig-Change-Id: I61137f5bb123dc5f610af9928ed3debdf85ba74d
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
13 years agoAdding a cleanspec to pick up version change. Do not merge.
Dan Morrill [Thu, 16 Jun 2011 20:43:50 +0000 (13:43 -0700)]
Adding a cleanspec to pick up version change. Do not merge.

Change-Id: I4853ae86488164400d7a0203614b9e87515f6e61

13 years agoMerge "add ANDROID_HOST_OUT to env (please do not merge)" into gingerbread
Ed Heyl [Thu, 16 Jun 2011 20:08:09 +0000 (13:08 -0700)]
Merge "add ANDROID_HOST_OUT to env (please do not merge)" into gingerbread

13 years agoUpdate version to 2.3.5.
Dan Morrill [Thu, 9 Jun 2011 20:20:55 +0000 (13:20 -0700)]
Update version to 2.3.5.

Change-Id: I310c09c6f2d1c0e0067bf4a44bed5958664c1591

13 years agoadd ANDROID_HOST_OUT to env (please do not merge)
Ed Heyl [Tue, 7 Jun 2011 19:02:51 +0000 (12:02 -0700)]
add ANDROID_HOST_OUT to env (please do not merge)

Change-Id: Iddc61e1f93e13a3884b919638da1c24271dd6ca5

13 years agoMerge from open-source gingerbread
Jean-Baptiste Queru [Wed, 1 Jun 2011 14:42:07 +0000 (07:42 -0700)]
Merge from open-source gingerbread

Change-Id: I417fc97191a14102617c0a87718bb690a1944e8b

13 years agoMerge "Relax the constraint of 64bit build environment." into gingerbread
Jean-Baptiste Queru [Tue, 31 May 2011 21:03:21 +0000 (14:03 -0700)]
Merge "Relax the constraint of 64bit build environment." into gingerbread

13 years agoSupport to run dex-preopt on prebuilt apks.
Ying Wang [Thu, 26 May 2011 22:59:56 +0000 (15:59 -0700)]
Support to run dex-preopt on prebuilt apks.

Change-Id: I11450310144cb8d7f127c427ada4a0589e030843

13 years agoRelax the constraint of 64bit build environment.
Ying Wang [Tue, 24 May 2011 22:46:15 +0000 (15:46 -0700)]
Relax the constraint of 64bit build environment.

Change-Id: Id8be221dcfa07651a4d9a2776b00e907b4ff750e

13 years agoMerge c4d4731b4dd306b74b9e2245b4983b6b3c5b866e: 'Build SDK repository'. Do not merge.
Raphael [Wed, 16 Feb 2011 00:09:36 +0000 (16:09 -0800)]
Merge c4d4731b4dd306b74b9e2245b4983b6b3c5b866e: 'Build SDK repository'. Do not merge.

When the build is invoked with the fake target "sdk_repo" and
a main target of sdk, win_sdk or sdk_addon, we now create
packages in DIST_DIR that can directly be used to populate the
SDK Repository.
This is quite close to how we actually distribute the SDK.

Change-Id: I863ac8baf159432d7c95df46cba6e4f3b9122629

13 years agoDisable dexpreopt for unbundled build.
Ying Wang [Wed, 12 Jan 2011 19:12:06 +0000 (11:12 -0800)]
Disable dexpreopt for unbundled build.

Cherry-picked from Honeycomb.

Change-Id: I1b8bf7faa3974f389a1f105b3397c4ceeea68885

13 years agoFix dependency of prebuilt target non-static Java libraries.
Ying Wang [Tue, 1 Feb 2011 20:57:45 +0000 (12:57 -0800)]
Fix dependency of prebuilt target non-static Java libraries.

Cherry-picked from Honeycomb to fix a dependency issue when building
prebuilt shared library.

Change-Id: I0a9cd3835b50dcc130a5f211e89d6bd22478fd42

13 years agoMerge "Close inherited PIPE before doing work" into gingerbread
Ying Wang [Wed, 16 Mar 2011 00:49:04 +0000 (17:49 -0700)]
Merge "Close inherited PIPE before doing work" into gingerbread

13 years agoDist build.prop in sdk builds.
Ying Wang [Tue, 8 Mar 2011 00:13:32 +0000 (16:13 -0800)]
Dist build.prop in sdk builds.

Change-Id: Id694a11fb644d21a69c89aad0bd6b0fa85aab32d

13 years agoMerge "version bump for new release (please don't merge)" into gingerbread
Ed Heyl [Tue, 8 Mar 2011 20:35:20 +0000 (12:35 -0800)]
Merge "version bump for new release   (please don't merge)" into gingerbread

13 years agoversion bump for new release (please don't merge)
Ed Heyl [Tue, 8 Mar 2011 02:05:40 +0000 (18:05 -0800)]
version bump for new release   (please don't merge)

Change-Id: I94081a1288da434811a1ddaa8a7b7b5da13d9341

13 years agoOnly copy once even if the first matched src:dest pair appears more than once.
Ying Wang [Wed, 3 Nov 2010 04:31:47 +0000 (21:31 -0700)]
Only copy once even if the first matched src:dest pair appears more than once.

Change-Id: I476923007dac1174371d6e6526d72182eb6c7243

13 years agoDrop support for target files with no recovery.fstab.
Ying Wang [Fri, 4 Mar 2011 05:52:08 +0000 (21:52 -0800)]
Drop support for target files with no recovery.fstab.

Change-Id: I099298cfffc2546975732a3bf0df60f96ccbdac4
Meanwhile don't build the ota and update zip files if no recovery.fstab
found.

13 years agoforce inclusion of system log tags in the event-log-tags file
Doug Zongker [Wed, 23 Feb 2011 20:17:29 +0000 (12:17 -0800)]
force inclusion of system log tags in the event-log-tags file

Change-Id: I59066ff151b6cb74a70bd8a900d473a533c84de3

13 years agoMerge "fix api level filtering script to compare integers, not strings" into gingerbread
Scott Main [Fri, 4 Feb 2011 23:11:59 +0000 (15:11 -0800)]
Merge "fix api level filtering script to compare integers, not strings" into gingerbread

13 years agofix api level filtering script to compare integers, not strings
Scott Main [Fri, 4 Feb 2011 23:10:33 +0000 (15:10 -0800)]
fix api level filtering script to compare integers, not strings

Change-Id: I4d0d6c40dd5c1f8470567ef30f0f7500b442fbe5

13 years agomerge "SDK: stub the maps.jar from the google_apis addon." from HC. Do not merge.
Raphael [Fri, 4 Feb 2011 06:59:27 +0000 (22:59 -0800)]
merge "SDK: stub the maps.jar from the google_apis addon." from HC. Do not merge.

Depends on change 8252cdea from development to get the
verbose/quiet flag for mkstub.

Change-Id: I1ac97023570a4fc8a0b9dd50db429c55184ec88c

13 years agofix TINY ANDROID yet again...
Brian Swetland [Wed, 2 Feb 2011 23:20:50 +0000 (15:20 -0800)]
fix TINY ANDROID yet again...

Change-Id: If52e1387c590be5ef467280ab2d1b56b8a823cd0

13 years agocherrypick Change-Id: Ib8a7ae66f0dc6db6a2c8f2a79238d95e67c627f3
Scott Main [Wed, 2 Feb 2011 04:32:18 +0000 (20:32 -0800)]
cherrypick Change-Id: Ib8a7ae66f0dc6db6a2c8f2a79238d95e67c627f3
backport some style changes for notes from master to gb

Change-Id: I4a7c6cfcadade5d90069ecab1edc694cb333430e

13 years agoMerge "don't use the sdkdoc template if the index file is a preview (the features...
Scott Main [Fri, 21 Jan 2011 20:00:51 +0000 (12:00 -0800)]
Merge "don't use the sdkdoc template if the index file is a preview (the features.html doc is no longer used, so removed check for that also)" into gingerbread

13 years agodon't use the sdkdoc template if the index file is a preview
Scott Main [Fri, 21 Jan 2011 19:58:56 +0000 (11:58 -0800)]
don't use the sdkdoc template if the index file is a preview
(the features.html doc is no longer used, so removed check for that also)

Change-Id: I1985b2e48060337030df53c19051ea363cb3b700

13 years agoDO NOT MERGE Fix issue #3373438: Update GBMR versions
Dianne Hackborn [Thu, 20 Jan 2011 20:17:41 +0000 (12:17 -0800)]
DO NOT MERGE Fix issue #3373438: Update GBMR versions

Change-Id: Ia334babece0d3cecb19da8ddd240ee300d0ac3ac

13 years agoMerge "Flesh out the languages_full list with recently added locales." into gingerbread
Eric Fischer [Tue, 18 Jan 2011 23:33:39 +0000 (15:33 -0800)]
Merge "Flesh out the languages_full list with recently added locales." into gingerbread

13 years agoFlesh out the languages_full list with recently added locales.
Eric Fischer [Fri, 14 Jan 2011 23:23:23 +0000 (15:23 -0800)]
Flesh out the languages_full list with recently added locales.

Change-Id: I8c43feba15f03e0b204b2d3ef136ea6e6e2e4fe2

13 years agoMerge from open-source gingerbread
Jean-Baptiste Queru [Fri, 14 Jan 2011 21:27:31 +0000 (13:27 -0800)]
Merge from open-source gingerbread

Change-Id: I7dce3075bab5831b48a66ef43a32a2be82eda19a

13 years agoMerge "CTS: pass vogar expectation location to CollectAllTests." into gingerbread
Jean-Baptiste Queru [Fri, 14 Jan 2011 20:46:35 +0000 (12:46 -0800)]
Merge "CTS: pass vogar expectation location to CollectAllTests." into gingerbread

13 years agodocs: update the sdk doc template to remove a bunch of obsolete
Scott Main [Fri, 14 Jan 2011 00:35:51 +0000 (16:35 -0800)]
docs: update the sdk doc template to remove a bunch of obsolete
things and clean up the logic statements for clarity

Change-Id: I75d333370d9e7135abda96c4ef50800f287cea97

13 years agoCTS: pass vogar expectation location to CollectAllTests.
Brett Chabot [Tue, 14 Dec 2010 22:45:08 +0000 (14:45 -0800)]
CTS: pass vogar expectation location to CollectAllTests.

Bug 3181338

Change-Id: I740ab73bee39975ad859b5e11b987ca74fd42658

13 years agoDon't prepend ./ before the dirs to be removed
Ying Wang [Tue, 4 Jan 2011 20:55:14 +0000 (12:55 -0800)]
Don't prepend ./ before the dirs to be removed

So that installclean can be done properly when OUT_DIR is set to an
obsolute path, such as /buildbot/out_dirs/git_gingerbread.
Bug: 3321625

Change-Id: Ibb9c86e514ebc5f1f821ca04ed9a0a83b37787df

13 years agoUse 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

13 years agoDO NOT MERGE: The API version changed and a bunch of stuff needs rebuilding, so just...
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

13 years ago(DO NOT MERGE) Issue #3255640: Need to bump GB to API 10 version name "2.4"
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

13 years agoMerge "Add support for custom Linux host toolchains when building the SDK." into...
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

13 years agoClose inherited PIPE before doing work
Ying Wang [Tue, 14 Dec 2010 00:25:36 +0000 (16:25 -0800)]
Close inherited PIPE before doing work

Gmake in Darwin has file descriptor leak.
In a full build, ota_from_target_files will inherits
more than 2000 open PIPEs from gmake and fails in a call to select.select().
This change fixes the build by closing the PIPEs before doing real work.

Change-Id: Ife021382198642a97bbbf0b623e4f24f3d86b2b2

13 years agoAdd support for custom Linux host toolchains when building the SDK.
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

13 years agoMerge "Default uninstallable modules' tag to optional" into gingerbread
Ying Wang [Sat, 11 Dec 2010 00:17:59 +0000 (16:17 -0800)]
Merge "Default uninstallable modules' tag to optional" into gingerbread

13 years agoDefault uninstallable modules' tag to optional
Ying Wang [Fri, 10 Dec 2010 19:17:28 +0000 (11:17 -0800)]
Default uninstallable modules' tag to optional

Change-Id: I31faee42c807b3b6d7b85feea6c74860c89d45de

13 years agoreconcile with open-source gingerbread
Jean-Baptiste Queru [Fri, 10 Dec 2010 15:46:16 +0000 (07:46 -0800)]
reconcile with open-source gingerbread

Change-Id: I817f61141bf2c5189b13965ea9f3ead8f19d61cb

13 years ago2.3.1
android-merger [Thu, 9 Dec 2010 18:50:19 +0000 (10:50 -0800)]
2.3.1

Change-Id: I9096a5b7a8e85274cac23d88635d3f49e6698cd8

13 years ago2.3.1
android-merger [Thu, 9 Dec 2010 18:50:19 +0000 (10:50 -0800)]
2.3.1

Change-Id: I64c7f35bb6cdfdfef01ce396798a0235642c0486

13 years agodocs: fix link
Scott Main [Mon, 6 Dec 2010 02:03:23 +0000 (18:03 -0800)]
docs: fix link

Change-Id: Id57ebbd12c16ef914ebe1d90260fdf8a5ae4587b

13 years agoAdd 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

13 years agodocs: 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

13 years agodocs: 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

13 years agodocs: revisions to ndk download intro
Scott Main [Fri, 5 Nov 2010 04:02:14 +0000 (21:02 -0700)]
docs: revisions to ndk download intro

Change-Id: Ib1ba3d5f0e727a1246dc92161b72bcfff6f9d772

13 years agoUpdate the template text for the NDK download page to point to new
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

13 years agodocs: make the resizable side nav standard. DO NOT MERGE.
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

13 years agoMerge "docs: update sdk download template DO NOT MERGE add windows installer and...
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

13 years agoam 16bf5290: (-s ours) Merge from AOSP froyo. Do not merge.
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.

13 years agoMerge from AOSP froyo. Do not merge.
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

13 years agodocs: update sdk download template DO NOT MERGE
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

13 years agocherry 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

13 years agoMerge "CTS vm-tests now depend on hosttestlib." into froyo
Jean-Baptiste Queru [Wed, 27 Oct 2010 21:59:39 +0000 (14:59 -0700)]
Merge "CTS vm-tests now depend on hosttestlib." into froyo

13 years agoCTS vm-tests now depend on hosttestlib.
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

13 years agodocs: 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

13 years agoDon'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

13 years agoGingerbread becomes real.
Dianne Hackborn [Mon, 18 Oct 2010 18:46:50 +0000 (11:46 -0700)]
Gingerbread becomes real.

Change-Id: I20668ef8a9221b802d785e9c8ea1b6b882f828ac

13 years agoMerge "remove whitespace from end of package descriptions, which added new lines...
Scott Main [Fri, 15 Oct 2010 18:20:26 +0000 (11:20 -0700)]
Merge "remove whitespace from end of package descriptions, which added new lines when the summary includes a paragraph. Do not merge." into gingerbread

13 years agoremove whitespace from end of package descriptions, which added new lines when the...
Scott Main [Fri, 15 Oct 2010 18:17:29 +0000 (11:17 -0700)]
remove whitespace from end of package descriptions, which added new lines when the summary includes a paragraph. Do not merge.

Change-Id: Ic8a7bec4f9a0aa81b8ab18d340281ad0d7e7c053

13 years agoAlways install libnfc_ndef.
Nick Pelly [Fri, 15 Oct 2010 08:01:20 +0000 (01:01 -0700)]
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>
13 years agoAdd SystemUI (notification bar) to SDK build.
Xavier Ducrohet [Thu, 14 Oct 2010 00:26:29 +0000 (17:26 -0700)]
Add SystemUI (notification bar) to SDK build.

Change-Id: I3f7001bfcf4ce61a523f7b24f61117225362b5a0

13 years agoMerge "Add all languages to the SDK image." into gingerbread
Xavier Ducrohet [Sun, 10 Oct 2010 21:31:10 +0000 (14:31 -0700)]
Merge "Add all languages to the SDK image." into gingerbread

13 years agoAdd all languages to the SDK image.
Xavier Ducrohet [Sun, 10 Oct 2010 21:14:49 +0000 (14:14 -0700)]
Add all languages to the SDK image.

Change-Id: I5d715fdc7f802a55786fff73863bbbc108c780d4

13 years agoresolved conflicts for merge of 0f8fcbe2 to gingerbread
Brian Muramatsu [Thu, 7 Oct 2010 21:31:21 +0000 (14:31 -0700)]
resolved conflicts for merge of 0f8fcbe2 to gingerbread

Change-Id: I0e1f13f957cba6dc90ba8a6aac6d3240b5be9019

13 years agoMerge "Add TTS language files to the full build." into gingerbread
Jean-Baptiste Queru [Thu, 7 Oct 2010 21:26:31 +0000 (14:26 -0700)]
Merge "Add TTS language files to the full build." into gingerbread

13 years agoMerge CTS-related change
Brian Muramatsu [Thu, 7 Oct 2010 19:51:33 +0000 (12:51 -0700)]
Merge CTS-related change

Change-Id: I622b2647f075a8cefe82f0373e2f37b6ca7e6e4b

13 years agoPrepend ccache to CC/CXX if necessary.
Ying Wang [Thu, 7 Oct 2010 17:45:02 +0000 (10:45 -0700)]
Prepend ccache to CC/CXX if necessary.

In case TARGET_CC is assigned with HOST_CC (eg, simulator build),
ccache will be prepended twice before this CL.
Bug: 3069576

Change-Id: I2ee44faea3a2795cf389ad6f80e4066a02b43be9

13 years agoCHERRY-PICK: propogate module tags for prebuilts
Dima Zavin [Thu, 16 Sep 2010 05:03:26 +0000 (22:03 -0700)]
CHERRY-PICK: propogate module tags for prebuilts

Change-Id: I08f1ae2ae4bb47a393cf5de1ed616d76fcd961c9
Signed-off-by: Dima Zavin <dima@android.com>
13 years agoAdd TTS language files to the full build.
Jean-Baptiste Queru [Wed, 6 Oct 2010 15:05:44 +0000 (08:05 -0700)]
Add TTS language files to the full build.

Bug: 3065214
Change-Id: I5c324965e693fe26d686b92d869e33facc92c762

13 years agoPass device characteristic information through to aapt.
Joe Onorato [Tue, 5 Oct 2010 21:33:58 +0000 (17:33 -0400)]
Pass device characteristic information through to aapt.

A build configuration can define PRODUCT_CHARACTERISTICS, which is
a comma-separated list of device characteristics, for example
"nosdcard,grayscale".  This will be passed through to aapt with
the --product flag.

Change-Id: I902c034b2f2824dbd2d33449308ee08beeb09551

13 years agoClean step for CL 71822
Ying Wang [Wed, 6 Oct 2010 01:07:29 +0000 (18:07 -0700)]
Clean step for CL 71822

Change-Id: Iddbefa915cdde0cc403134711b6ffd056c402db2

13 years agoSupport Additional CTS Host Jars
Brian Muramatsu [Thu, 2 Sep 2010 19:36:59 +0000 (12:36 -0700)]
Support Additional CTS Host Jars

Include another optional Makefile from the CTS project that
specifies additional JARs that the CTS host may need. This
will make it easier to create modules in the CTS project
that can be built for the host and device and shared between
the host and test cases.

The first such library will include annotations like
"RequiresFeature" and "SupportsProfile" that will be needed
to support multiple device profiles in CTS.

Another planned libraries could include defining the CTS
version number in a central spot and sharing code used to
probe for certain properties like the OpenGL version and
other system properties.

Can be checked in after this other change without causing
breakage: https://review.source.android.com/#change,16740

Change-Id: I3c488247b66522dc86277ab43198c34f790e0618

13 years agoAny intermediate targets between Progaurd and the built_dex should be differently...
Ying Wang [Sun, 3 Oct 2010 01:35:51 +0000 (18:35 -0700)]
Any intermediate targets between Progaurd and the built_dex should be differently named.

Change-Id: Ifb01b1fcf24ba0c5b98aa02dd604cd81918e1841

To do that, we have to move classes.jar step before proguard, so classes.jar is always with the full names.

13 years agoMove odex related files to product-specific dir.
Ying Wang [Sat, 25 Sep 2010 01:09:04 +0000 (18:09 -0700)]
Move odex related files to product-specific dir.

For target Java libraries, now the LOCAL_BUILT_MODULE includes both javalib.jar
and the .odex file, if dexpreopt is enabled.
These 2 files are moved to a product-specific dir in this change.
For target Java Libraries, $(intermediates) now points to the product-specific dir.
There is still a javalib.jar in the $(intermediates.COMMON) dir, which is used as dependency.
Nothing is changed for host Java libraries.

Change-Id: I2546dbb940c74537864ca002d1acb49bb731fbbc

13 years agoMerge "Allow 'export WITH_HOST_DALVIK=false' to override Makefile defaulting" into...
Brian Carlstrom [Thu, 30 Sep 2010 22:00:31 +0000 (15:00 -0700)]
Merge "Allow 'export WITH_HOST_DALVIK=false' to override Makefile defaulting" into gingerbread

13 years agoAllow 'export WITH_HOST_DALVIK=false' to override Makefile defaulting
Brian Carlstrom [Thu, 30 Sep 2010 21:41:54 +0000 (14:41 -0700)]
Allow 'export WITH_HOST_DALVIK=false' to override Makefile defaulting

Change-Id: I8915bc1c9f52a3b6ab1a82b404ab61cd0726198d

13 years agoUse the new sdk/build/tools.atree.
Xavier Ducrohet [Mon, 27 Sep 2010 22:51:32 +0000 (15:51 -0700)]
Use the new sdk/build/tools.atree.

As the sdk.git project is branched differently from the rest
of the platform, it's important to be able to control what
goes in the tools folder of the SDK on a per-branch basis.

Right now development/build/sdk.atree control what goes in
the tools folder (coming almost only from sdk.git) which causes
problems when the development.git and sdk.git branches are not
in sync.

Change-Id: I9158501cd68783d593e49e5fdea7f17d19b0120f

13 years agoSeparate out Proguard flag files to fix dependency.
Ying Wang [Wed, 29 Sep 2010 21:50:41 +0000 (14:50 -0700)]
Separate out Proguard flag files to fix dependency.

Bug: 3048005
Change-Id: I3e77ca1082cf7c92a43b249e5c887e3fbdf4ba11

13 years agoInform dex-preopt when the target device is a uniprocessor.
Dan Bornstein [Wed, 29 Sep 2010 18:54:15 +0000 (11:54 -0700)]
Inform dex-preopt when the target device is a uniprocessor.

By default, dex-preopt optimizes for an SMP target.

Change-Id: Ib92552e55f5426b9b035ce862233752af090bb43

13 years agoMerge "Fix mmm to work with an ANDROID_BUILD_TOP that contains a symlink" into ginger...
Brian Carlstrom [Wed, 29 Sep 2010 00:45:59 +0000 (17:45 -0700)]
Merge "Fix mmm to work with an ANDROID_BUILD_TOP that contains a symlink" into gingerbread

13 years agoMerge "framework-res is not used as regular Java library now." into gingerbread
Ying Wang [Wed, 29 Sep 2010 00:32:36 +0000 (17:32 -0700)]
Merge "framework-res is not used as regular Java library now." into gingerbread

13 years agoframework-res is not used as regular Java library now.
Ying Wang [Wed, 29 Sep 2010 00:27:56 +0000 (17:27 -0700)]
framework-res is not used as regular Java library now.

Change-Id: Ic2b8f7d7bceab3be7884eb4a7dbe721c14bd1ccb

13 years agoMerge "Add location shared library to core build." into gingerbread
Dianne Hackborn [Wed, 29 Sep 2010 00:14:39 +0000 (17:14 -0700)]
Merge "Add location shared library to core build." into gingerbread