Commit Graph

3294 Commits

Author SHA1 Message Date
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
Jean-Baptiste Queru f724dbf7cb Merge from gingerbread
Change-Id: Icfc2bb041b1360a8a0258d7de5547fded86bf7ec
2010-12-10 08:01:07 -08:00
Jean-Baptiste Queru 2562a40eb1 reconcile with open-source gingerbread
Change-Id: I817f61141bf2c5189b13965ea9f3ead8f19d61cb
2010-12-10 07:46:16 -08:00
android-merger 1840de544b 2.3.1
Change-Id: I9096a5b7a8e85274cac23d88635d3f49e6698cd8
2010-12-10 07:42:24 -08:00
android-merger 0c3d5d9541 2.3.1
Change-Id: I64c7f35bb6cdfdfef01ce396798a0235642c0486
2010-12-09 16:11:38 -08:00
Jean-Baptiste Queru dbd4369187 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.
2010-12-06 15:12:02 -08:00
Jean-Baptiste Queru 3ef1d67480 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.
2010-12-06 15:10:35 -08:00
Jean-Baptiste Queru 4985f06f4e Merge "Make image-size-from-data-size not use hard coded values." 2010-12-06 14:58:08 -08:00
Lars Svensson 9cb8c28352 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
2010-12-06 16:18:46 +01:00
Scott Main 1c4fe5aaff am dad569b4: docs: fix link
* commit 'dad569b4e815dee7056ff4d2e593ddadc3e087e1':
  docs: fix link
2010-12-05 19:04:18 -08:00
Scott Main dad569b4e8 docs: fix link
Change-Id: Id57ebbd12c16ef914ebe1d90260fdf8a5ae4587b
2010-12-05 18:03:23 -08:00
Sriram Raman 064a4562a4 am c647aeca: Add mkuserimg.sh, make_ext4fs to otatools
* commit 'c647aecabb9cf03d73cfc34836e3bfc886b54c2e':
  Add mkuserimg.sh, make_ext4fs to otatools
2010-11-30 11:45:14 -08:00
Sriram Raman c647aecabb Add mkuserimg.sh, make_ext4fs to otatools
Change-Id: Id48d6643f4579d695685fe2595bd86a80a5083c3
2010-11-29 18:55:39 -05:00
Jean-Baptiste Queru 29ead58259 am d2dd8652: Merge "Added generic hook for loading vendor specific tasks."
* commit 'd2dd86529982cd05b4010248cea368fbef763ef2':
  Added generic hook for loading vendor specific tasks.
2010-11-24 09:33:25 -08:00
Jean-Baptiste Queru d2dd865299 Merge "Added generic hook for loading vendor specific tasks." 2010-11-24 09:23:35 -08:00
Claes Elgemark e22ad6784c 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
2010-11-24 15:40:24 +01:00
Jean-Baptiste Queru ce5d7e04a8 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'
2010-11-23 10:51:44 -08:00
Jean-Baptiste Queru 7fbeda2b1e Merge "Adding `all' to INTERNAL_MODIFIER_TARGETS to fix `make all'" 2010-11-23 10:37:08 -08:00
Magnus Bäck 6ba4ebf272 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
2010-11-23 10:36:50 -08:00
Jean-Baptiste Queru 6c7b6fb3d2 resolved conflicts for merge of b2028868 to gingerbread-plus-aosp
Change-Id: Ibe616c0bdf8e36aaee42279292a2dbe03c5643c2
2010-11-19 12:35:33 -08:00
Jean-Baptiste Queru b20288680e Merge "IA: enable SSE fpmath, Separate ARCH_VARIANT and ARCH makefile settings" 2010-11-19 11:15:56 -08:00
Bruce Beare ccec9c45d9 IA: enable SSE fpmath, Separate ARCH_VARIANT and ARCH makefile settings
Change-Id: I60b8121c92b39a60b513bc2496a1e0a21015c586
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
2010-11-19 11:15:40 -08:00
Jean-Baptiste Queru 554eeb6c74 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
2010-11-19 11:15:19 -08:00
Jean-Baptiste Queru 493306f7c3 Merge "Fix TARGET_PREBUILT_TAG so that get_build_var can retrieve the correct value across architectures" 2010-11-19 11:01:22 -08:00
Jean-Baptiste Queru cc21582fb3 resolved conflicts for merge of 4130c80a to gingerbread-plus-aosp
Change-Id: I4c37c4a6a54c3fb005eec4789bfcf96678d8cec9
2010-11-19 10:58:11 -08:00
Jean-Baptiste Queru 4130c80aa3 Merge "Correct makefile test for stagefright build" 2010-11-19 10:45:27 -08:00
Bruce Beare 885b6b99d3 Correct makefile test for stagefright build
Change-Id: Ia79b97d43e3fad82491e7d6197ffef2e764a63e3
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
2010-11-19 10:45:11 -08:00