OSDN Git Service
Xavier Ducrohet [Tue, 18 Jan 2011 17:54:23 +0000 (09:54 -0800)]
am
0e581c25: am
aafe93b1: Merge "Add librs_jni to the sdk product packages." into honeycomb
* commit '
0e581c25d44afdf619e1903a5b471df7a69c073f':
Add librs_jni to the sdk product packages.
Xavier Ducrohet [Tue, 18 Jan 2011 17:52:58 +0000 (09:52 -0800)]
am
aafe93b1: Merge "Add librs_jni to the sdk product packages." into honeycomb
* commit '
aafe93b14b7980c8569080f24212c252d9e74dd7':
Add librs_jni to the sdk product packages.
Xavier Ducrohet [Tue, 18 Jan 2011 17:50:54 +0000 (09:50 -0800)]
Merge "Add librs_jni to the sdk product packages." into honeycomb
Scott Main [Tue, 18 Jan 2011 16:47:18 +0000 (08:47 -0800)]
shared_user android-merger-prebuild [Tue, 18 Jan 2011 16:24:17 +0000 (08:24 -0800)]
am
be7ca98a: reovle conflicts for
cc089099
* commit '
be7ca98a86a6fc6de822a410c3234fbccd67fd0c':
update sdk template... thought this was merged already, but also re-add section for offline preview
Scott Main [Tue, 18 Jan 2011 16:24:00 +0000 (08:24 -0800)]
shared_user android-merger-prebuild [Tue, 18 Jan 2011 16:21:32 +0000 (08:21 -0800)]
reovle conflicts for
cc089099
Change-Id: Ia449a3a3dc13928afb5c6ab6f4dcdf6eb049372b
Scott Main [Tue, 18 Jan 2011 07:31:37 +0000 (23:31 -0800)]
am
73f2e196: resolved conflicts for merge
7bc0fb1b to honeycomb-plus-aosp
* commit '
73f2e196dbfc81a9d3cf9d49bda72277374586c2':
docs: revise preview statement and links
Dharmaray Kundargi [Tue, 18 Jan 2011 07:30:57 +0000 (23:30 -0800)]
am
fd5aca8b: am
c86bcf5f: Merge "add videoeditor libraries to make" into honeycomb
* commit '
fd5aca8bb196e24b8b9c8189e2389f4f9087f804':
add videoeditor libraries to make
Scott Main [Tue, 18 Jan 2011 03:56:23 +0000 (19:56 -0800)]
resolved conflicts for merge
7bc0fb1b to honeycomb-plus-aosp
Change-Id: I32563b59c552a0ad3b07f300e3a1e450bd03826c
Scott Main [Tue, 18 Jan 2011 02:23:21 +0000 (18:23 -0800)]
fix build
Change-Id: If4adf6b91b932f44c5456bd76fed968e9d84c556
Dharmaray Kundargi [Tue, 18 Jan 2011 00:56:44 +0000 (16:56 -0800)]
am
c86bcf5f: Merge "add videoeditor libraries to make" into honeycomb
* commit '
c86bcf5f16b4c74139c67b742539222e3b290889':
add videoeditor libraries to make
Scott Main [Tue, 18 Jan 2011 00:44:10 +0000 (16:44 -0800)]
update sdk template... thought this was merged already,
but also re-add section for offline preview
Change-Id: I4337f06657603c71e326398dfe7b4d1507252a16
Xavier Ducrohet [Tue, 18 Jan 2011 00:39:36 +0000 (16:39 -0800)]
Add librs_jni to the sdk product packages.
This is similar to
88e76ceca0514ce4ff5558d2f5842cdfe07f811c
but the SDK build does not extend generic_no_telephony.
Change-Id: Id01178b2a89d002aca52d57ad7c9dfb4e1184216
Scott Main [Tue, 18 Jan 2011 00:15:19 +0000 (16:15 -0800)]
docs: revise preview statement and links
Change-Id: I9c0bde91c2c87c661fe877608a48a5bd577860f3
Dharmaray Kundargi [Mon, 17 Jan 2011 18:52:26 +0000 (10:52 -0800)]
Merge "add videoeditor libraries to make" into honeycomb
David 'Digit' Turner [Mon, 17 Jan 2011 07:04:13 +0000 (23:04 -0800)]
am
665aefdd: am
1fa29fc9: Merge "Add librs_jni to the generic product packages." into honeycomb
* commit '
665aefdd2a47abe7abff61a83e78a2e4470ca004':
Add librs_jni to the generic product packages.
David 'Digit' Turner [Mon, 17 Jan 2011 07:02:36 +0000 (23:02 -0800)]
am
9c0fa6d5: am
6efeec6a: am
755bed4c: Merge "Add support for custom Linux host toolchains when building the SDK."
* commit '
9c0fa6d5891fd478ab6108bb21099389c5992384':
Add support for custom Linux host toolchains when building the SDK.
Dianne Hackborn [Mon, 17 Jan 2011 06:59:26 +0000 (22:59 -0800)]
am
a24ed68e: am
68404ba4: Bump API version up to 10, thus resource version up to 11.
* commit '
a24ed68eee3465565a8d1251e7339eadecc2969a':
Bump API version up to 10, thus resource version up to 11.
Dharmaray Kundargi [Mon, 17 Jan 2011 00:45:20 +0000 (16:45 -0800)]
add videoeditor libraries to make
Change-Id: I024f087bd026f709fdbfc1272c79166ad9bf5bcd
David 'Digit' Turner [Mon, 17 Jan 2011 00:11:19 +0000 (16:11 -0800)]
am
1fa29fc9: Merge "Add librs_jni to the generic product packages." into honeycomb
* commit '
1fa29fc9e248f382351bcd55cf7196cb39ec8b57':
Add librs_jni to the generic product packages.
David 'Digit' Turner [Mon, 17 Jan 2011 00:08:45 +0000 (16:08 -0800)]
Merge "Add librs_jni to the generic product packages." into honeycomb
David 'Digit' Turner [Sun, 16 Jan 2011 23:15:34 +0000 (00:15 +0100)]
Add librs_jni to the generic product packages.
Without this, HC cannot start under emulation (because some RenderScript-related
classes fail to preload properly during the boot, killing Zygote, even if they
are later never used).
Change-Id: I825051603425df59b9677875eba0ae2a811649ee
David 'Digit' Turner [Sun, 16 Jan 2011 22:53:44 +0000 (14:53 -0800)]
am
6efeec6a: am
755bed4c: Merge "Add support for custom Linux host toolchains when building the SDK."
* commit '
6efeec6a1e568517844a6231b2328fa263667312':
Add support for custom Linux host toolchains when building the SDK.
David 'Digit' Turner [Sun, 16 Jan 2011 22:51:28 +0000 (14:51 -0800)]
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.
David 'Digit' Turner [Sun, 16 Jan 2011 22:30:34 +0000 (14:30 -0800)]
Merge "Add support for custom Linux host toolchains when building the SDK."
Dianne Hackborn [Sun, 16 Jan 2011 20:46:03 +0000 (12:46 -0800)]
am
68404ba4: Bump API version up to 10, thus resource version up to 11.
* commit '
68404ba40ef52b7c5da5425fd51f99ae3434bfa0':
Bump API version up to 10, thus resource version up to 11.
Dianne Hackborn [Sun, 16 Jan 2011 19:07:28 +0000 (11:07 -0800)]
Bump API version up to 10, thus resource version up to 11.
Change-Id: I305999c2ff71cc5985d0fc50e496c40e789d3af0
Jean-Baptiste Queru [Sun, 16 Jan 2011 18:42:56 +0000 (10:42 -0800)]
David 'Digit' Turner [Wed, 12 Jan 2011 22:31:29 +0000 (23:31 +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: I914f5a303f16b6871759ce5a7178585ed3060870
Jean-Baptiste Queru [Sat, 15 Jan 2011 05:30:10 +0000 (21:30 -0800)]
Jean-Baptiste Queru [Sat, 15 Jan 2011 01:12:54 +0000 (17:12 -0800)]
Jean-Baptiste Queru [Sat, 15 Jan 2011 01:09:06 +0000 (17:09 -0800)]
merge from gingerbread
Change-Id: I05a6bed8b7275114ce545a7a45f2e13bf5469ec0
Jesse Wilson [Sat, 15 Jan 2011 00:22:26 +0000 (16:22 -0800)]
Merge "Move apache-xml to external. (project 3 of 4)"
Jean-Baptiste Queru [Fri, 14 Jan 2011 21:44:17 +0000 (13:44 -0800)]
am
4125d8ee: am
a4781e86: Merge from open-source gingerbread
* commit '
4125d8ee68bec37fe471faeca7dfade73a7a1592':
CTS: pass vogar expectation location to CollectAllTests.
Jean-Baptiste Queru [Fri, 14 Jan 2011 21:43:02 +0000 (13:43 -0800)]
am
a4781e86: Merge from open-source gingerbread
* commit '
a4781e867f2e9115ce5b8085576bebf6505bfd00':
CTS: pass vogar expectation location to CollectAllTests.
Jean-Baptiste Queru [Fri, 14 Jan 2011 21:27:31 +0000 (13:27 -0800)]
Merge from open-source gingerbread
Change-Id: I7dce3075bab5831b48a66ef43a32a2be82eda19a
Jean-Baptiste Queru [Fri, 14 Jan 2011 20:46:35 +0000 (12:46 -0800)]
Merge "CTS: pass vogar expectation location to CollectAllTests." into gingerbread
Scott Main [Fri, 14 Jan 2011 20:14:06 +0000 (12:14 -0800)]
resolved conflicts for merge of
08b96428 to honeycomb-plus-aosp
Change-Id: I63bb548206a91319954c7ed8fccfe880bad6048c
Scott Main [Fri, 14 Jan 2011 04:08:24 +0000 (20:08 -0800)]
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
Jesse Wilson [Fri, 14 Jan 2011 01:21:58 +0000 (17:21 -0800)]
Move apache-xml to external. (project 3 of 4)
Change-Id: Ib65348e4203e6ac653e9fe81369b21dad06b5b58
http://b/
3351604
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
Raphael [Thu, 13 Jan 2011 18:33:39 +0000 (10:33 -0800)]
am
23d3dedb: Merge "Add llvm-rs-cc to the tools buildable under Windows." into honeycomb
* commit '
23d3dedb870d9ca867c7366632cadcdbc4e49f31':
Add llvm-rs-cc to the tools buildable under Windows.
Raphael [Thu, 13 Jan 2011 18:30:19 +0000 (10:30 -0800)]
Merge "Add llvm-rs-cc to the tools buildable under Windows." into honeycomb
Scott Main [Thu, 13 Jan 2011 02:57:38 +0000 (18:57 -0800)]
am
0a53dc49: docs: make only the expando link not-underlined and wait until close animation is done before collapsing the toggle
* commit '
0a53dc4984c0726c1c5cfd55500ee88680e4018c':
docs: make only the expando link not-underlined and wait until close animation is done before collapsing the toggle
Scott Main [Thu, 13 Jan 2011 00:50:00 +0000 (16:50 -0800)]
docs: make only the expando link not-underlined
and wait until close animation is done before collapsing the toggle
Change-Id: Ie75f99a5cf5fcc2cbf33bb46a00ce79cd688ce5c
Scott Main [Wed, 12 Jan 2011 23:02:51 +0000 (15:02 -0800)]
am
e5781194: docs: implement toggle features for documentation content. There existed another form of this script and styles, but it was not used.
* commit '
e578119466fffebd7667172b28da155c5fbc194b':
docs: implement toggle features for documentation content. There existed another form of this script and styles, but it was not used.
Scott Main [Wed, 12 Jan 2011 22:33:58 +0000 (14:33 -0800)]
docs: implement toggle features for documentation content.
There existed another form of this script and styles, but it was not used.
Change-Id: I5d3bf0b4f6b8159e8f837692e9b1613aae140e24
Raphael [Wed, 12 Jan 2011 21:33:04 +0000 (13:33 -0800)]
Add llvm-rs-cc to the tools buildable under Windows.
To be able to "make llvm-rs-cc" as a Windows SDK tool, we
first need to let the build system know which folders can be
built.
Once this is done, building can be done using the mingw32
package to do cross-compiling under Linux:
$ USE_MINGW=1 make llvm-rs-cc
Change-Id: I5538f4c52c74dad18dd50b59c9bdbcd6de3fd191
Ying Wang [Wed, 12 Jan 2011 19:14:13 +0000 (11:14 -0800)]
am
94978cf4: Disable dexpreopt for unbundled build.
* commit '
94978cf495879120c2dadf7afb2058688546be09':
Disable dexpreopt for unbundled build.
Ying Wang [Wed, 12 Jan 2011 19:12:06 +0000 (11:12 -0800)]
Disable dexpreopt for unbundled build.
Change-Id: Iad0cc41cfad2533703a0dddad743720c43ddb667
Ying Wang [Tue, 11 Jan 2011 22:56:28 +0000 (14:56 -0800)]
am
79609e35: am
a712543e: Don\'t prepend ./ before the dirs to be removed
* commit '
79609e35883de164fe9630c32409a897d3a6d81a':
Don't prepend ./ before the dirs to be removed
Dirk Dougherty [Sat, 8 Jan 2011 01:07:43 +0000 (17:07 -0800)]
Doc change: Remove redundant dir and image.
Change-Id: I6867250f48b71d857b1cf80f28392ec9879005c7
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
Scott Main [Fri, 7 Jan 2011 20:08:09 +0000 (12:08 -0800)]
docs: catchup templates to non-merged changes from gingerbread,
from Change-Id: I4555c496088dd8aac77f9aa01273c3a1d52f89e0, plus
the gingerbread logo
Change-Id: I3864480b9f68679c64747888a6919314f8ac6cbf
Ying Wang [Fri, 7 Jan 2011 17:23:03 +0000 (09:23 -0800)]
am
a712543e: Don\'t prepend ./ before the dirs to be removed
* commit '
a712543ec35bd834ad52d47375ab7ec04b8ed3f7':
Don't prepend ./ before the dirs to be removed
Dianne Hackborn [Thu, 6 Jan 2011 20:47:43 +0000 (12:47 -0800)]
We. Are. Honeycomb!
Change-Id: Ife02e57541fe6be14d62619b98fddba57a8132f4
Raphael Moll [Wed, 5 Jan 2011 23:50:22 +0000 (15:50 -0800)]
am
e503fcd5: am
7e27c8e1: Merge "Pass OUT_DIR variable to atree."
* commit '
e503fcd52ec8bbcc9fd4ea4b242f73c6c2cae3d3':
Pass OUT_DIR variable to atree.
Raphael Moll [Wed, 5 Jan 2011 23:48:24 +0000 (15:48 -0800)]
am
7e27c8e1: Merge "Pass OUT_DIR variable to atree."
* commit '
7e27c8e15507d62a0ac0b094bc7cfca15f6cc509':
Pass OUT_DIR variable to atree.
Raphael Moll [Wed, 5 Jan 2011 23:35:24 +0000 (15:35 -0800)]
Merge "Pass OUT_DIR variable to atree."
Raphael Moll [Wed, 5 Jan 2011 22:58:17 +0000 (14:58 -0800)]
Pass OUT_DIR variable to atree.
Change-Id: Iabbe905341dfe970448682a9dcbb170a04ad5222
Jason parks [Wed, 5 Jan 2011 21:14:49 +0000 (13:14 -0800)]
Merge "Add the CryptKeeper to the build."
Jason parks [Wed, 5 Jan 2011 20:51:42 +0000 (14:51 -0600)]
Add the CryptKeeper to the build.
Change-Id: I094c5f24cd7f9f1241d301984badd15b38eef33a
Jing Yu [Wed, 5 Jan 2011 19:56:25 +0000 (11:56 -0800)]
Merge "Remove global inline options."
Jeff Brown [Wed, 5 Jan 2011 01:30:46 +0000 (17:30 -0800)]
Merge "Add libinput to prelink map."
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: I87667355aa03f31613a8f6a5e17d7e469bf5335f
Jeff Brown [Wed, 5 Jan 2011 00:01:15 +0000 (16:01 -0800)]
Add libinput to prelink map.
Change-Id: I26998d4799d26165b3f528d1cd292b212eaaab9d
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
Jean-Baptiste Queru [Thu, 30 Dec 2010 00:02:14 +0000 (16:02 -0800)]
am
41c423da: am
96d3e9b3: Merge "generic_x86 builds don\'t need/use the sparse ext4 format."
* commit '
41c423da9df557b87e8db490b3ed4d4b34470423':
generic_x86 builds don't need/use the sparse ext4 format.
Jean-Baptiste Queru [Thu, 30 Dec 2010 00:02:12 +0000 (16:02 -0800)]
am
827c662d: am
e28ae87a: Merge "Use ext4 file system for generic_x86 userdata partition"
* commit '
827c662d8f145e5a0492838c951dad5d96716c71':
Use ext4 file system for generic_x86 userdata partition
Jean-Baptiste Queru [Thu, 30 Dec 2010 00:02:09 +0000 (16:02 -0800)]
am
4bd05717: am
670ccf2c: Merge "GB Updates for init.rc and boot command line"
* commit '
4bd05717e2156a0eeb9de81de3e8595b560f2627':
GB Updates for init.rc and boot command line
Ying Wang [Wed, 29 Dec 2010 22:31:27 +0000 (14:31 -0800)]
Merge "Enhance product vars examining."
Jean-Baptiste Queru [Wed, 29 Dec 2010 22:31:01 +0000 (14:31 -0800)]
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.
Jean-Baptiste Queru [Wed, 29 Dec 2010 22:31:00 +0000 (14:31 -0800)]
am
e28ae87a: Merge "Use ext4 file system for generic_x86 userdata partition"
* commit '
e28ae87af9a9b83ce7e1821d4840edf3b99aec0e':
Use ext4 file system for generic_x86 userdata partition
Jean-Baptiste Queru [Wed, 29 Dec 2010 22:30:58 +0000 (14:30 -0800)]
am
670ccf2c: Merge "GB Updates for init.rc and boot command line"
* commit '
670ccf2c458ed02d2d1e548b48d2eec29cb3d958':
GB Updates for init.rc and boot command line
Ying Wang [Wed, 29 Dec 2010 22:07:38 +0000 (14:07 -0800)]
Enhance product vars examining.
Change-Id: I348629aa6e63ad24d457e91af8f75712dcf91b27
Jean-Baptiste Queru [Wed, 29 Dec 2010 22:17:28 +0000 (14:17 -0800)]
Merge "generic_x86 builds don't need/use the sparse ext4 format."
Jean-Baptiste Queru [Wed, 29 Dec 2010 22:17:05 +0000 (14:17 -0800)]
Merge "Use ext4 file system for generic_x86 userdata partition"
Jean-Baptiste Queru [Wed, 29 Dec 2010 22:10:17 +0000 (14:10 -0800)]
Merge "GB Updates for init.rc and boot command line"
Mike Lockwood [Wed, 29 Dec 2010 14:07:38 +0000 (09:07 -0500)]
Add libmtp and libusbhost to prelink map
Change-Id: I7e81edcbb24778143a01039e9cb12f22a922e00a
Signed-off-by: Mike Lockwood <lockwood@android.com>
Ying Wang [Wed, 29 Dec 2010 00:40:01 +0000 (16:40 -0800)]
Merge "LOCAL_AAPT_INCLUDE_ALL_RESOURCES"
Bruce Beare [Tue, 28 Dec 2010 23:33:22 +0000 (15:33 -0800)]
generic_x86 builds don't need/use the sparse ext4 format.
Change-Id: I62973b131a728c3862be4642e2d49d0fa61555ac
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Bruce Beare [Mon, 27 Dec 2010 21:05:23 +0000 (13:05 -0800)]
Use ext4 file system for generic_x86 userdata partition
Change-Id: I05710c2bda521b35712513bc219fc73ed00e4617
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Bruce Beare [Mon, 27 Dec 2010 20:37:52 +0000 (12:37 -0800)]
GB Updates for init.rc and boot command line
Change-Id: I0638c8834fccbdc94ec99e7592a75b6972cb53b8
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Jean-Baptiste Queru [Tue, 28 Dec 2010 21:59:33 +0000 (13:59 -0800)]
am
54c5e5b1: am
1b8c01db: Merge "Product-configurable sparse ext images."
* commit '
54c5e5b18be967a46fbee8769c392cbe0dfe7530':
Product-configurable sparse ext images.
Jean-Baptiste Queru [Tue, 28 Dec 2010 21:51:53 +0000 (13:51 -0800)]
am
1b8c01db: Merge "Product-configurable sparse ext images."
* commit '
1b8c01dbee93366e31b67529a26e1a7b6198c876':
Product-configurable sparse ext images.
Jean-Baptiste Queru [Tue, 28 Dec 2010 21:43:32 +0000 (13:43 -0800)]
Merge "Product-configurable sparse ext images."
Ying Wang [Wed, 17 Nov 2010 23:40:38 +0000 (15:40 -0800)]
Product-configurable sparse ext images.
Also pass extfs sparse image flag to the release tool.
Change-Id: I79a6a71873634a231aa8990cee22374259601505
Ying Wang [Tue, 28 Dec 2010 21:14:29 +0000 (13:14 -0800)]
LOCAL_AAPT_INCLUDE_ALL_RESOURCES
Set this flag to include all the resources in the given dirs.
Bug:
3313179
Change-Id: I68c02b24174bebe41a5948810cc2f49cc916e51c
Jing Yu [Wed, 22 Dec 2010 00:33:48 +0000 (16:33 -0800)]
Remove global inline options.
The purpose of removing global inline options is to give
compiler the opportunity to do inline optimizations and inline
tunings for Android native codes.
By removing these global inline options now, the size of
almost all native libraries are reduced. And there is no
noticable performance degradation on webkit, gcstone and
skia benchmarks.
Change-Id: I31e71f51e4f29fa6286fddb89e9eab227581c7b3
Ying Wang [Mon, 20 Dec 2010 19:42:35 +0000 (11:42 -0800)]
am
098826bf: am
099fecd7: Use PRIVATE_CXX in HOST modules.
* commit '
098826bf61cba2b14a0538100878bdb029f50790':
Use PRIVATE_CXX in HOST modules.
Ying Wang [Mon, 20 Dec 2010 19:40:33 +0000 (11:40 -0800)]
am
099fecd7: Use PRIVATE_CXX in HOST modules.
* commit '
099fecd759ce54168fe4094880d1ca748e8906b9':
Use 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
Jean-Baptiste Queru [Fri, 17 Dec 2010 00:04:26 +0000 (16:04 -0800)]
am
28599d02: Ignore
9bfb8142 from gingerbread
* commit '
28599d022e80651c2f21274d6055b03f4154d3e1':
DO NOT MERGE: The API version changed and a bunch of stuff needs rebuilding, so just wipe $(OUT_DIR).
Jean-Baptiste Queru [Thu, 16 Dec 2010 23:43:46 +0000 (15:43 -0800)]
Ignore
9bfb8142 from gingerbread
Change-Id: Ie0ec4fc224d23516906b9ca750c5200aa7fbf63c
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
Brian Carlstrom [Wed, 15 Dec 2010 21:21:21 +0000 (13:21 -0800)]
Merge "Scrub the set of dalvik modules that are built by default"
Ying Wang [Wed, 15 Dec 2010 21:18:23 +0000 (13:18 -0800)]
Merge "Add framework includes for any aidl source."
Brian Carlstrom [Wed, 15 Dec 2010 06:35:10 +0000 (22:35 -0800)]
Scrub the set of dalvik modules that are built by default
Bug:
3009435
Change-Id: I20d88df665e48aa74c20cef7e236de377cd0d14b
Jean-Baptiste Queru [Wed, 15 Dec 2010 00:26:34 +0000 (16:26 -0800)]
am
34e82671: resolved conflicts for merge of
76aa8d0a to gingerbread-plus-aosp
* commit '
34e826718e99d56da38ecd5ffd8873997722fa92':
update API version to 9