Doug Zongker
eaa464e6c4
am a34fa95c
: force inclusion of system log tags in the event-log-tags file
...
* commit 'a34fa95c164a9388ed0b84b17a63241bffd4132a':
force inclusion of system log tags in the event-log-tags file
2011-02-23 13:25:45 -08:00
Doug Zongker
a34fa95c16
force inclusion of system log tags in the event-log-tags file
...
Change-Id: I59066ff151b6cb74a70bd8a900d473a533c84de3
2011-02-23 12:17:29 -08:00
Kenny Root
747a9780a8
am 951a3e5f
: Merge "Build system tweaks for Valgrind."
...
* commit '951a3e5f416d9ebe84e922132c85c8696d5d74a0':
Build system tweaks for Valgrind.
2011-02-17 11:38:51 -08:00
Jeff Brown
bd528a82a2
Build system tweaks for Valgrind.
...
Added LOCAL_NO_CRT to enable building executables that do not link
to the C runtime library.
Removed support for LOCAL_MODULE_SUBDIR since it was broken
and unused. (Was going to use it but ended up using LOCAL_MODULE_PATH
instead.)
Change-Id: Ifed4ffe17003d90370c711ea6606e2b75e841dee
2011-02-16 15:06:30 -08:00
David 'Digit' Turner
b3f59bde44
am 86a90364
: Merge "core/binary.mk: Add missing Objective-C objects to the build."
...
* commit '86a903647f3f3df4484396ec58ba5b0454abd36e':
core/binary.mk: Add missing Objective-C objects to the build.
2011-02-15 10:10:45 -08:00
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
3e01b48370
am 843c6e25
: merge "SDK: stub the maps.jar from the google_apis addon." from HC. Do not merge.
...
* commit '843c6e2530a0783ae1a5a4758cb5e76ad975ae72':
merge "SDK: stub the maps.jar from the google_apis addon." from HC. Do not merge.
2011-02-04 14:49:17 -08:00
Raphael
843c6e2530
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
2011-02-04 12:34:54 -08:00
Raphael Moll
ed19189877
am a15717c9
: am 6b7b53cb
: Merge "SDK: Enable "make sdk/common" under Windows"
...
* commit 'a15717c9905e32f2724645e3734567c40d8d3eb0':
SDK: Enable "make sdk/common" under Windows
2011-02-03 11:42:34 -08:00
Raphael
79e1d2cf99
am 6b6e8114
: am 4167b2ba
: Merge "SDK: Strip llvm-rs-cc in SDK."
...
* commit '6b6e8114810bb26a64e1d8d9814fdfadb90c3848':
SDK: Strip llvm-rs-cc in SDK.
2011-02-03 09:05:07 -08:00
Raphael Moll
192d1ef6d7
SDK: Enable "make sdk/common" under Windows
...
Change-Id: Id9cba159f434fb18f6e3b648954b3f8ddb580dc0
2011-02-02 15:59:46 -08:00
Brian Swetland
678c7ac997
am d7798a7e
: fix TINY ANDROID yet again...
...
* commit 'd7798a7e1b3241c49d7c8325cf14ac608350b719':
fix TINY ANDROID yet again...
2011-02-02 15:23:20 -08:00
Brian Swetland
d7798a7e1b
fix TINY ANDROID yet again...
...
Change-Id: If52e1387c590be5ef467280ab2d1b56b8a823cd0
2011-02-02 15:20:50 -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
e29ef594e6
Merge from open-source master
...
Change-Id: Id74236b5a2b2717bbe45c684573106555c7d9ad2
2011-01-31 15:14:54 -08:00
Jean-Baptiste Queru
83e2f942b6
partial build fix
...
Change-Id: I831c4c646eca96c6513018fbc5ad88970b942775
2011-01-31 12:59:54 -08:00
Jean-Baptiste Queru
bf041eb259
partial build fix
...
Change-Id: I34fe778ac366d702b9eb626feaedda05e69e8361
2011-01-31 12:35:02 -08:00
Jean-Baptiste Queru
2039512c30
am 61356271
: am e388ac10
: Merge "Extra protobuf-related support"
...
* commit '6135627140bd799ee56ba894b69a9455ca0af86a':
Extra protobuf-related support
2011-01-27 14:27:32 -08:00
Jean-Baptiste Queru
c61d4c91b6
Extra protobuf-related support
...
Change-Id: I375d32f0bcb695ccb0603743133034941d584163
2011-01-27 13:49:30 -08:00
Jean-Baptiste Queru
53cebd72f7
am ad3e0072
: am 39f358b7
: Merge "Protobuf compiler support in the build system"
...
* commit 'ad3e00724d62e5def2f2552533a62a800e9f3ee9':
Protobuf compiler support in the build system
2011-01-27 13:32:03 -08:00
Jean-Baptiste Queru
5a50ecee40
am f273723f
: am 1e0055fb
: Merge "A few more grandfathered user tags"
...
* commit 'f273723f7710bb127ee1026e05049e4ee5290c8a':
A few more grandfathered user tags
2011-01-27 13:22:36 -08:00
Jean-Baptiste Queru
79ee7bf896
Protobuf compiler support in the build system
2011-01-27 12:44:30 -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
020e2fc14a
am 928a0304
: re-merge from readonly-korg-master - do not merge
...
* commit '928a03043187b7c4843b2c832b589c57b7541e4a':
re-merge from readonly-korg-master - do not merge
2011-01-27 09:24:43 -08:00
Jean-Baptiste Queru
928a030431
re-merge from readonly-korg-master - do not merge
...
Change-Id: Ifc1e39261e1fcaefc1e314d994e71115624643a2
2011-01-27 09:21:58 -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
Jean-Baptiste Queru
fce88928fe
Revert "Merge commit '50738779' into gingerbread-plus-aosp" - do not merge
...
This reverts commit 7e1ce27c08
, reversing
changes made to 7dfc127096
.
Change-Id: I2b4c33ad56a12612f2fc05845428409d7023f683
2011-01-21 07:50:36 -08:00
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
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
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
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
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
54c5e5b18b
am 1b8c01db
: Merge "Product-configurable sparse ext images."
...
* commit '1b8c01dbee93366e31b67529a26e1a7b6198c876':
Product-configurable sparse ext images.
2010-12-28 13:51:53 -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
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