Commit graph

3270 commits

Author SHA1 Message Date
Ed Heyl
7e1ce27c08 Merge commit '50738779' into gingerbread-plus-aosp
Conflicts:
	core/version_defaults.mk

Change-Id: I69ae9d5b3e0532c67c401a8320e69aab5ee66b0f
2011-01-20 18:08:34 -08:00
Dianne Hackborn
50738779d9 DO NOT MERGE Fix issue #3373438: Update GBMR versions
Change-Id: Ia334babece0d3cecb19da8ddd240ee300d0ac3ac
2011-01-20 12:17:41 -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
Eric Fischer
54a6b731da Merge "Flesh out the languages_full list with recently added locales." into gingerbread 2011-01-18 15:33:39 -08:00
David 'Digit' Turner
6efeec6a1e am 755bed4c: Merge "Add support for custom Linux host toolchains when building the SDK."
* commit '755bed4cc8ed20449f807feeff44e98c8b20c3ba':
  Add support for custom Linux host toolchains when building the SDK.
2011-01-16 14:51:28 -08:00
David 'Digit' Turner
755bed4cc8 Merge "Add support for custom Linux host toolchains when building the SDK." 2011-01-16 14:30:34 -08:00
David 'Digit' Turner
60a1e88052 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: I914f5a303f16b6871759ce5a7178585ed3060870
2011-01-16 19:14:04 +01:00
Jean-Baptiste Queru
8e9d20b3c4 am 27016763: merge from gingerbread
* commit '27016763c7c0e568fb8eb26ab3d30282f027a72d':
2011-01-14 17:12:54 -08:00
Jean-Baptiste Queru
27016763c7 merge from gingerbread
Change-Id: I05a6bed8b7275114ce545a7a45f2e13bf5469ec0
2011-01-14 17:09:18 -08: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
Jean-Baptiste Queru
4125d8ee68 am a4781e86: Merge from open-source gingerbread
* commit 'a4781e867f2e9115ce5b8085576bebf6505bfd00':
  CTS: pass vogar expectation location to CollectAllTests.
2011-01-14 13:43:02 -08:00
Jean-Baptiste Queru
a4781e867f Merge from open-source gingerbread
Change-Id: I7dce3075bab5831b48a66ef43a32a2be82eda19a
2011-01-14 13:27:48 -08:00
Jean-Baptiste Queru
9ac1e65fad Merge "CTS: pass vogar expectation location to CollectAllTests." into gingerbread 2011-01-14 12:46:35 -08:00
Scott Main
08b964285b am 66888a7c: docs: update the sdk doc template to remove a bunch of obsolete things and clean up the logic statements for clarity
* commit '66888a7c420f911574c59dd10d32f62bada91adb':
  docs: update the sdk doc template to remove a bunch of obsolete things and clean up the logic statements for clarity
2011-01-13 20:08:24 -08:00
Scott Main
66888a7c42 docs: update the sdk doc template to remove a bunch of obsolete
things and clean up the logic statements for clarity

Change-Id: I75d333370d9e7135abda96c4ef50800f287cea97
2011-01-13 16:35:51 -08:00
Brett Chabot
fdb400cf20 CTS: pass vogar expectation location to CollectAllTests.
Bug 3181338

Change-Id: I740ab73bee39975ad859b5e11b987ca74fd42658
2011-01-07 16:19:02 -08:00
Ying Wang
79609e3588 am a712543e: Don\'t prepend ./ before the dirs to be removed
* commit 'a712543ec35bd834ad52d47375ab7ec04b8ed3f7':
  Don't prepend ./ before the dirs to be removed
2011-01-07 09:23:03 -08:00
Raphael Moll
e503fcd52e am 7e27c8e1: Merge "Pass OUT_DIR variable to atree."
* commit '7e27c8e15507d62a0ac0b094bc7cfca15f6cc509':
  Pass OUT_DIR variable to atree.
2011-01-05 15:48:24 -08:00
Raphael Moll
7e27c8e155 Merge "Pass OUT_DIR variable to atree." 2011-01-05 15:35:24 -08:00
Raphael Moll
7558ad55ce Pass OUT_DIR variable to atree.
Change-Id: Iabbe905341dfe970448682a9dcbb170a04ad5222
2011-01-05 14:58:17 -08:00
Ying Wang
a712543ec3 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
2011-01-04 12:57:58 -08:00
Jean-Baptiste Queru
41c423da9d am 96d3e9b3: Merge "generic_x86 builds don\'t need/use the sparse ext4 format."
* commit '96d3e9b3108eb430a01cca41cb06baa1b8eb22ec':
  generic_x86 builds don't need/use the sparse ext4 format.
2010-12-29 14:31:01 -08:00
Jean-Baptiste Queru
827c662d8f am e28ae87a: Merge "Use ext4 file system for generic_x86 userdata partition"
* commit 'e28ae87af9a9b83ce7e1821d4840edf3b99aec0e':
  Use ext4 file system for generic_x86 userdata partition
2010-12-29 14:31:00 -08:00
Jean-Baptiste Queru
4bd05717e2 am 670ccf2c: Merge "GB Updates for init.rc and boot command line"
* commit '670ccf2c458ed02d2d1e548b48d2eec29cb3d958':
  GB Updates for init.rc and boot command line
2010-12-29 14:30:58 -08:00
Jean-Baptiste Queru
96d3e9b310 Merge "generic_x86 builds don't need/use the sparse ext4 format." 2010-12-29 14:17:28 -08:00
Jean-Baptiste Queru
e28ae87af9 Merge "Use ext4 file system for generic_x86 userdata partition" 2010-12-29 14:17:05 -08:00
Jean-Baptiste Queru
670ccf2c45 Merge "GB Updates for init.rc and boot command line" 2010-12-29 14:10:17 -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
Jean-Baptiste Queru
54c5e5b18b am 1b8c01db: Merge "Product-configurable sparse ext images."
* commit '1b8c01dbee93366e31b67529a26e1a7b6198c876':
  Product-configurable sparse ext images.
2010-12-28 13:51:53 -08:00
Jean-Baptiste Queru
1b8c01dbee Merge "Product-configurable sparse ext images." 2010-12-28 13:43:32 -08:00
Ying Wang
085a14698b Product-configurable sparse ext images.
Also pass extfs sparse image flag to the release tool.

Change-Id: I79a6a71873634a231aa8990cee22374259601505
2010-12-28 13:41:33 -08:00
Ying Wang
098826bf61 am 099fecd7: Use PRIVATE_CXX in HOST modules.
* commit '099fecd759ce54168fe4094880d1ca748e8906b9':
  Use PRIVATE_CXX in HOST modules.
2010-12-20 11:40:33 -08:00
Ying Wang
099fecd759 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
2010-12-20 11:18:28 -08:00
Jean-Baptiste Queru
28599d022e Ignore 9bfb8142 from gingerbread
Change-Id: Ie0ec4fc224d23516906b9ca750c5200aa7fbf63c
2010-12-16 15:43:57 -08:00
Jeff Hamilton
9bfb81426b DO NOT MERGE: The API version changed and a bunch of stuff needs rebuilding, so just wipe $(OUT_DIR).
Change-Id: I7b6c291db3ec09c7b53949a04cc792912004a1de
2010-12-15 18:33:33 -06:00
Jean-Baptiste Queru
34e826718e resolved conflicts for merge of 76aa8d0a to gingerbread-plus-aosp
Change-Id: I7fa43d5b5d52b68baca3e4848cd308fea1d1fb98
2010-12-14 16:23:36 -08:00
Jean-Baptiste Queru
76aa8d0a8b update API version to 9
Change-Id: Ia573996bb910e19c8f7017ca13cf9d9d77083404
2010-12-14 16:16:44 -08:00
Jean-Baptiste Queru
3463d0e102 resolved conflicts for merge of c1b33081 to gingerbread-plus-aosp - DO NOT MERGE
Change-Id: I785e36efe89cc11e2dacfb4a30901be93453f221
2010-12-14 16:12:23 -08:00
Dianne Hackborn
c1b330818e (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
2010-12-14 11:30:43 -08:00
David 'Digit' Turner
efc5d81428 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.
2010-12-14 02:42:10 -08:00
David 'Digit' Turner
15f4980d51 Merge "Add support for custom Linux host toolchains when building the SDK." into gingerbread 2010-12-14 02:37:05 -08:00
David 'Digit' Turner
0960ca7488 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
2010-12-13 11:52:03 +01:00
Ying Wang
1f22360f60 am c7973678: Merge "Default uninstallable modules\' tag to optional" into gingerbread
* commit 'c79736785716d56768998d64317ff90a62073868':
  Default uninstallable modules' tag to optional
2010-12-10 16:21:43 -08:00
Ying Wang
c797367857 Merge "Default uninstallable modules' tag to optional" into gingerbread 2010-12-10 16:17:59 -08:00
Ying Wang
2fd81cf11e Default uninstallable modules' tag to optional
Change-Id: I31faee42c807b3b6d7b85feea6c74860c89d45de
2010-12-10 11:17:28 -08:00
Jean-Baptiste Queru
2145c46aa2 am 2562a40e: reconcile with open-source gingerbread
* commit '2562a40eb1afa88e8e3b97fb4c96f2241d28ec1e':
2010-12-10 08:58:22 -08:00
Jean-Baptiste Queru
89aa0ebfb8 Ignore 0c3d5d95 from gingerbread
Version number changes don't merge across codelines

Change-Id: I97e65e0ced9158da86568a32dc08f133755b9267
2010-12-10 08:56:22 -08:00
Jean-Baptiste Queru
04eaeae310 am f724dbf7: Merge from gingerbread
* commit 'f724dbf7cb697f947d761afc34b23971278452a8':
  2.3.1
2010-12-10 08:05:23 -08:00