Eric Fischer
e6e583ffab
am 7dfc1270: am 54a6b731: Merge "Flesh out the languages_full list with recently added locales." into gingerbread
...
* commit '7dfc1270967c96be6dcd58fb7770c07482a7e90d':
Flesh out the languages_full list with recently added locales.
2011-01-21 14:37:20 -08:00
Jean-Baptiste Queru
43b1bb5be1
(Re-)Set version names for AOSP master - do not merge
...
Change-Id: I0973090ebf00a9e0deb8ec2beb0f39fa93bc03c1
2011-01-21 07:59:40 -08:00
Brian Swetland
cb6fbf88db
am a7600364: fix tiny android build
...
* commit 'a7600364feb0eff313374e9dd0502ea7e15085f6':
fix tiny android build
2011-01-20 17:07:27 -08:00
Brian Swetland
a7600364fe
fix tiny android build
...
Change-Id: Ifa6cda67f54969588b5c4e9f900ac2d4ba607e71
Signed-off-by: Brian Swetland <swetland@google.com>
2011-01-20 15:34:39 -08:00
Michael Chan
87762c7e1f
am b43ac8fc: Fix build break
...
* commit 'b43ac8fc2fbb3530212a613108c2492969e33146':
Fix build break
2011-01-19 21:19:39 -08:00
Michael Chan
b43ac8fc2f
Fix build break
...
Change-Id: Ie07f042a9f25bf3329cf2cea8fdeea3e208da775
2011-01-19 21:12:41 -08:00
Ken Sumrall
77b01a8c22
am 6f2f23a4: Merge "Teach the build system to reserve the last 16 Kbytes of /data for the crypto footer" into honeycomb
...
* commit '6f2f23a46f077213ff2f984a6b55e9672560289f':
Teach the build system to reserve the last 16 Kbytes of /data for the crypto footer
2011-01-19 17:39:46 -08:00
Ken Sumrall
6f2f23a46f
Merge "Teach the build system to reserve the last 16 Kbytes of /data for the crypto footer" into honeycomb
2011-01-19 17:35:30 -08:00
Ken Sumrall
a67616acfd
Teach the build system to reserve the last 16 Kbytes of /data for the crypto footer
...
If making /data and it's an EMMC interface, reserve the last 16 Kbytes
of the partition for the crypto footer.
Change-Id: Ia2c0bb53a545f074e79fc9d6ac04faee75fb9be4
2011-01-19 17:14:51 -08:00
Ying Wang
4d3ac24daf
am 84ed6fa2: Disable "-t" for acp.
...
* commit '84ed6fa27b883de8ba7b41ddecaa2179e7f4b321':
Disable "-t" for acp.
2011-01-19 14:38:00 -08:00
Ying Wang
84ed6fa27b
Disable "-t" for acp.
...
Acp can not handle high resolution file timestamp on ext4.
We need this to fix incremental build on ext4.
Change-Id: I54e45c73ffa44c4253c7a431375d419fa4dccfd9
2011-01-19 12:15:38 -08:00
Ying Wang
df3a8ab5aa
am 85aa5ded: Add external/clang/lib/Headers as llvm-rs-cc\'s system header search path
...
* commit '85aa5ded4ca0338f7c0c8d4256143364ca2cea38':
Add external/clang/lib/Headers as llvm-rs-cc's system header search path
2011-01-19 12:03:22 -08:00
Ying Wang
85aa5ded4c
Add external/clang/lib/Headers as llvm-rs-cc's system header search path
...
Change-Id: I30257631d484491d9a8346205e411013c76c5a91
Bug: 2943524
2011-01-19 11:50:09 -08:00
Ying Wang
04a4d9ade8
am 04e1f31d: Move videoeditor libraries to generic_no_telephony.mk.
...
* commit '04e1f31dfdf7511cb8f5dbdf0376651fbb783fa2':
Move videoeditor libraries to generic_no_telephony.mk.
2011-01-19 10:33:12 -08:00
Ying Wang
04e1f31dfd
Move videoeditor libraries to generic_no_telephony.mk.
...
Change-Id: I8ea2058b79ccfda3114ba64b4e43c175a0fe086c
2011-01-19 10:28:05 -08:00
Kristian Monsen
def863f719
am da7575bc: Making more space for libwebcore.so
...
* commit 'da7575bc70ace95aba75f40f79ed46b4ab1a9913':
Making more space for libwebcore.so
2011-01-19 03:22:36 -08:00
Eric Fischer
7dfc127096
am 54a6b731: Merge "Flesh out the languages_full list with recently added locales." into gingerbread
...
* commit '54a6b731da4029237410f04c1b6cb9b64bf2783f':
Flesh out the languages_full list with recently added locales.
2011-01-18 15:35:46 -08:00
Eric Fischer
54a6b731da
Merge "Flesh out the languages_full list with recently added locales." into gingerbread
2011-01-18 15:33:39 -08:00
Kristian Monsen
da7575bc70
Making more space for libwebcore.so
...
Taking half the space of libexpat.so and libbinder.so so there
is still room to grow (webkit mergers tend to make libwebcore
larger)
Change-Id: I6d5bf385221c8e199e587c3a7c8c9425a15a5bb6
2011-01-18 22:02:11 +00:00
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