David 'Digit' Turner
5ca286d58b
core/binary.mk: Add missing Objective-C objects to the build.
...
For some reason, all_objects was not listing objects generated from
objective-C sources. We need these for the emulator (which builds its
own version of SDL which uses Quartz on OS X).
+ Fix a typo in transform-host-m-to-o definition.
This also explains why https://review.source.android.com/#change,21074
had to be reverted, since it gets rid of the prebuilt SDL libraries when
building the emulator.
Change-Id: I173811cf11cdb5b045073aade59364236145bc77
2011-02-11 17:52:52 +01:00
Raphael Moll
6b7b53cb36
Merge "SDK: Enable "make sdk/common" under Windows"
2011-02-03 10:45:50 -08:00
Raphael Moll
192d1ef6d7
SDK: Enable "make sdk/common" under Windows
...
Change-Id: Id9cba159f434fb18f6e3b648954b3f8ddb580dc0
2011-02-02 15:59:46 -08:00
Raphael
4167b2bae5
Merge "SDK: Strip llvm-rs-cc in SDK."
2011-02-02 13:41:14 -08:00
Raphael
39f4b566da
SDK: Strip llvm-rs-cc in SDK.
...
SDK Bug: 3394374
Change-Id: I728112795ad40a31a1b4c476e043ef213241c617
2011-02-02 11:31:38 -08:00
Jean-Baptiste Queru
2d946f7ac9
Merge "partial build fix"
2011-01-31 13:00:23 -08:00
Jean-Baptiste Queru
83e2f942b6
partial build fix
...
Change-Id: I831c4c646eca96c6513018fbc5ad88970b942775
2011-01-31 12:59:54 -08:00
Jean-Baptiste Queru
de50cfb5f9
Merge "partial build fix"
2011-01-31 12:36:05 -08:00
Jean-Baptiste Queru
bf041eb259
partial build fix
...
Change-Id: I34fe778ac366d702b9eb626feaedda05e69e8361
2011-01-31 12:35:02 -08:00
Jean-Baptiste Queru
e388ac10b9
Merge "Extra protobuf-related support"
2011-01-27 14:19:04 -08:00
Jean-Baptiste Queru
c61d4c91b6
Extra protobuf-related support
...
Change-Id: I375d32f0bcb695ccb0603743133034941d584163
2011-01-27 13:49:30 -08:00
Jean-Baptiste Queru
70b8941f19
Merge "Add dnsproxyd to keep in sync with base init.rc"
2011-01-27 13:38:33 -08:00
Bruce Beare
d59072d4d4
Add dnsproxyd to keep in sync with base init.rc
...
Change-Id: I8785cb5a5297c3cc6f3b0152fcae578a9ea89e89
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
2011-01-27 13:32:47 -08:00
Jean-Baptiste Queru
39f358b75f
Merge "Protobuf compiler support in the build system"
2011-01-27 13:12:09 -08:00
Jean-Baptiste Queru
79ee7bf896
Protobuf compiler support in the build system
2011-01-27 12:44:30 -08:00
Jean-Baptiste Queru
1e0055fb91
Merge "A few more grandfathered user tags"
2011-01-27 12:17:52 -08:00
Jean-Baptiste Queru
2497b6109b
A few more grandfathered user tags
...
Change-Id: I57309b461ec2395da068961f976c904bd3474e88
2011-01-27 12:17:00 -08:00
Jean-Baptiste Queru
4a91aa9b40
Merge "Add a few more legacy modules that can have user tags - do not merge"
2011-01-27 08:26:25 -08:00
Jean-Baptiste Queru
4fd2ef057a
Add a few more legacy modules that can have user tags - do not merge
...
Change-Id: I198d3eb34958e46ccba145bd05452027cba5e464
2011-01-27 08:18:41 -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
27016763c7
merge from gingerbread
...
Change-Id: I05a6bed8b7275114ce545a7a45f2e13bf5469ec0
2011-01-14 17:09:18 -08:00
Jean-Baptiste Queru
9ac1e65fad
Merge "CTS: pass vogar expectation location to CollectAllTests." into gingerbread
2011-01-14 12:46:35 -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
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
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
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
Jean-Baptiste Queru
76aa8d0a8b
update API version to 9
...
Change-Id: Ia573996bb910e19c8f7017ca13cf9d9d77083404
2010-12-14 16:16:44 -08:00
Jean-Baptiste Queru
f724dbf7cb
Merge from gingerbread
...
Change-Id: Icfc2bb041b1360a8a0258d7de5547fded86bf7ec
2010-12-10 08:01:07 -08:00
android-merger
1840de544b
2.3.1
...
Change-Id: I9096a5b7a8e85274cac23d88635d3f49e6698cd8
2010-12-10 07:42:24 -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
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