Rebecca Schultz Zavin
1ec15e1e83
am d64f0edd
: Merge "Include batch in legacy prebuilts with tcmd and ftmipcd." into honeycomb
...
* commit 'd64f0edd649880cb7de769f0f373ddf520dd22d3':
Include batch in legacy prebuilts with tcmd and ftmipcd.
2011-01-18 13:48:42 -08:00
Rebecca Schultz Zavin
d64f0edd64
Merge "Include batch in legacy prebuilts with tcmd and ftmipcd." into honeycomb
2011-01-18 13:46:47 -08:00
James Wilson
4e74e30a6a
Include batch in legacy prebuilts with tcmd and ftmipcd.
...
Change-Id: Iad6d7974bfadd3467270033f982de0642657d472
Signed-off-by: James Wilson <james.wilson@motorola.com>
2011-01-18 13:40:05 -08:00
Shih-wei Liao
500c053777
am 10aab0ef
: Merge "Remove libbcc and libLLVM* from the grand-fathered modules." into honeycomb
...
* commit '10aab0ef97efc626c5bb2b239061a38924fc6a13':
Remove libbcc and libLLVM* from the grand-fathered modules.
2011-01-18 11:15:36 -08:00
Shih-wei Liao
10aab0ef97
Merge "Remove libbcc and libLLVM* from the grand-fathered modules." into honeycomb
2011-01-18 11:04:00 -08:00
Xavier Ducrohet
155776bf06
am a17fe58b
: Update SDK app list.
...
* commit 'a17fe58b4662a49213250aa988f3ad446b92a6d4':
Update SDK app list.
2011-01-18 10:20:22 -08:00
Xavier Ducrohet
a17fe58b46
Update SDK app list.
...
Change-Id: I1a99b0bd716f90688aea9b9db20e393a91ad8ad2
2011-01-18 10:10:32 -08:00
Ying Wang
fa2aca54b2
am 4162f45c
: Merge "Don\'t increase image sizes for the release tools." into honeycomb
...
* commit '4162f45c90c083b55b8c8d134faad6e1817ea960':
Don't increase image sizes for the release tools.
2011-01-18 09:54:53 -08:00
Xavier Ducrohet
0e581c25d4
am aafe93b1
: Merge "Add librs_jni to the sdk product packages." into honeycomb
...
* commit 'aafe93b14b7980c8569080f24212c252d9e74dd7':
Add librs_jni to the sdk product packages.
2011-01-18 09:52:58 -08:00
Ying Wang
4162f45c90
Merge "Don't increase image sizes for the release tools." into honeycomb
2011-01-18 09:52:07 -08:00
Xavier Ducrohet
aafe93b14b
Merge "Add librs_jni to the sdk product packages." into honeycomb
2011-01-18 09:50:54 -08:00
Scott Main
1da32388e1
am 58286dcd
: fix build
...
* commit '58286dcd1f065b8170303874eb5ff07b6c590232':
fix build
2011-01-18 08:24:00 -08:00
shared_user android-merger-prebuild
be7ca98a86
reovle conflicts for cc089099
...
Change-Id: Ia449a3a3dc13928afb5c6ab6f4dcdf6eb049372b
2011-01-18 08:21:32 -08:00
Scott Main
73f2e196db
resolved conflicts for merge 7bc0fb1b
to honeycomb-plus-aosp
...
Change-Id: I32563b59c552a0ad3b07f300e3a1e450bd03826c
2011-01-17 19:56:23 -08:00
Scott Main
58286dcd1f
fix build
...
Change-Id: If4adf6b91b932f44c5456bd76fed968e9d84c556
2011-01-17 18:23:21 -08:00
Dharmaray Kundargi
fd5aca8bb1
am c86bcf5f
: Merge "add videoeditor libraries to make" into honeycomb
...
* commit 'c86bcf5f16b4c74139c67b742539222e3b290889':
add videoeditor libraries to make
2011-01-17 16:56:44 -08:00
Scott Main
cc08909978
update sdk template... thought this was merged already,
...
but also re-add section for offline preview
Change-Id: I4337f06657603c71e326398dfe7b4d1507252a16
2011-01-17 16:44:10 -08:00
Xavier Ducrohet
92cbc443ec
Add librs_jni to the sdk product packages.
...
This is similar to 88e76ceca0
but the SDK build does not extend generic_no_telephony.
Change-Id: Id01178b2a89d002aca52d57ad7c9dfb4e1184216
2011-01-17 16:39:36 -08:00
Scott Main
7bc0fb1b32
docs: revise preview statement and links
...
Change-Id: I9c0bde91c2c87c661fe877608a48a5bd577860f3
2011-01-17 16:16:12 -08:00
Dharmaray Kundargi
c86bcf5f16
Merge "add videoeditor libraries to make" into honeycomb
2011-01-17 10:52:26 -08:00
Shih-wei Liao
0c71bf7ac6
Remove libbcc and libLLVM* from the grand-fathered modules.
...
Change-Id: I7030cdbe6e51c42a4053d7ab8a47a705bff72be7
2011-01-17 01:13:42 -08:00
Dharmaray Kundargi
21d812fd69
add videoeditor libraries to make
...
Change-Id: I024f087bd026f709fdbfc1272c79166ad9bf5bcd
2011-01-16 16:45:20 -08:00
David 'Digit' Turner
665aefdd2a
am 1fa29fc9
: Merge "Add librs_jni to the generic product packages." into honeycomb
...
* commit '1fa29fc9e248f382351bcd55cf7196cb39ec8b57':
Add librs_jni to the generic product packages.
2011-01-16 16:11:19 -08:00
David 'Digit' Turner
1fa29fc9e2
Merge "Add librs_jni to the generic product packages." into honeycomb
2011-01-16 16:08:45 -08:00
David 'Digit' Turner
88e76ceca0
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
2011-01-17 00:15:34 +01:00
David 'Digit' Turner
9c0fa6d589
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.
2011-01-16 14:53:44 -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
Dianne Hackborn
a24ed68eee
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.
2011-01-16 12:46:03 -08:00
Dianne Hackborn
68404ba40e
Bump API version up to 10, thus resource version up to 11.
...
Change-Id: I305999c2ff71cc5985d0fc50e496c40e789d3af0
2011-01-16 11:07:28 -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
d3cd4db0f7
am 8e9d20b3
: am 27016763
: merge from gingerbread
...
* commit '8e9d20b3c4c78cf04db9d1bef8a1438f848cd944':
2011-01-14 21:30:10 -08: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
Jean-Baptiste Queru
163c718228
am 4125d8ee
: am a4781e86
: Merge from open-source gingerbread
...
* commit '4125d8ee68bec37fe471faeca7dfade73a7a1592':
CTS: pass vogar expectation location to CollectAllTests.
2011-01-14 13:44:17 -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
2752980df4
resolved conflicts for merge of 08b96428
to honeycomb-plus-aosp
...
Change-Id: I63bb548206a91319954c7ed8fccfe880bad6048c
2011-01-14 12:27:04 -08:00
Ying Wang
008367111e
Don't increase image sizes for the release tools.
...
So it keeps consistent with the command run in the makefile.
Change-Id: Id26fa3387aa9bbab88c4ef3fbd26aff0d039c2e1
2011-01-14 11:30:56 -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
Raphael
d67c0f79db
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.
2011-01-13 10:33:39 -08:00
Raphael
23d3dedb87
Merge "Add llvm-rs-cc to the tools buildable under Windows." into honeycomb
2011-01-13 10:30:19 -08:00
Scott Main
8d5a99cdb5
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
2011-01-12 18:57:38 -08:00
Scott Main
0a53dc4984
docs: make only the expando link not-underlined
...
and wait until close animation is done before collapsing the toggle
Change-Id: Ie75f99a5cf5fcc2cbf33bb46a00ce79cd688ce5c
2011-01-12 17:35:53 -08:00
Scott Main
a4a122b76b
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.
2011-01-12 15:02:51 -08:00
Scott Main
e578119466
docs: implement toggle features for documentation content.
...
There existed another form of this script and styles, but it was not used.
Change-Id: I5d3bf0b4f6b8159e8f837692e9b1613aae140e24
2011-01-12 14:33:58 -08:00
Raphael
d3e6fcbe6c
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
2011-01-12 13:33:04 -08:00
Ying Wang
bf2cffb9bc
am 94978cf4
: Disable dexpreopt for unbundled build.
...
* commit '94978cf495879120c2dadf7afb2058688546be09':
Disable dexpreopt for unbundled build.
2011-01-12 11:14:13 -08:00