OSDN Git Service
Brian Carlstrom [Wed, 26 Jan 2011 23:34:10 +0000 (15:34 -0800)]
am
56c35da7: am
bb219fc3: Add LOCAL_JARJAR_RULES support for BUILD_HOST_JAVA_LIBRARY
* commit '
56c35da7fbc21acbf7297ffff3b7e474c4ac4198':
Add LOCAL_JARJAR_RULES support for BUILD_HOST_JAVA_LIBRARY
Brian Carlstrom [Wed, 26 Jan 2011 23:32:03 +0000 (15:32 -0800)]
am
bb219fc3: Add LOCAL_JARJAR_RULES support for BUILD_HOST_JAVA_LIBRARY
* commit '
bb219fc3dc29e832f3cd8e435c94a894ef2ee87f':
Add LOCAL_JARJAR_RULES support for BUILD_HOST_JAVA_LIBRARY
Brian Carlstrom [Wed, 26 Jan 2011 23:09:47 +0000 (15:09 -0800)]
Add LOCAL_JARJAR_RULES support for BUILD_HOST_JAVA_LIBRARY
Bug:
3086427
Change-Id: Ibe73dfa70d4c3d82968c43e74ced38cd74f60e0f
Doug Zongker [Wed, 26 Jan 2011 17:56:30 +0000 (09:56 -0800)]
am
bc06b17c: am
55d93284: support use of prebuilt bootable images
* commit '
bc06b17c82ecfdec70314d45282207a41ea3ee5f':
support use of prebuilt bootable images
Doug Zongker [Wed, 26 Jan 2011 17:54:43 +0000 (09:54 -0800)]
am
55d93284: support use of prebuilt bootable images
* commit '
55d932840f1a5b412f2961f79368ecec2d28f647':
support use of prebuilt bootable images
Doug Zongker [Wed, 26 Jan 2011 01:03:34 +0000 (17:03 -0800)]
support use of prebuilt bootable images
img_from_target_files now, with the -z flag, will produce an output
zip with only the bootable partitions (boot and recovery).
img_ and ota_from_target_files can take, instead of a simple
"target_files.zip", a name of the form
"target_files.zip+bootable_images.zip", where the second zip contains
bootable images that should be used instead of building them from the
target_files.zip. (This should be the zip produced by the above -z
flag, perhaps with the images messed with in some way, such as by an
unnamed OEM's extra signature wrapper for their "secure boot"
process.)
Bug:
3391371
Change-Id: Iaf96dfc8f30e806ae342dcf3241566e76ae372d4
Ying Wang [Tue, 25 Jan 2011 07:25:36 +0000 (23:25 -0800)]
Correct misuse of target/host vars.
Change-Id: Ide41aeddc44ca05d85a36035c2d55ea453cfd216
Robert Greenwalt [Tue, 25 Jan 2011 01:51:14 +0000 (17:51 -0800)]
am
75e557d1: am
b6c2b1c6: Fix SDK connectivity.
* commit '
75e557d11331afaca818ec60a75c3a62253d9542':
Fix SDK connectivity.
Robert Greenwalt [Tue, 25 Jan 2011 01:48:52 +0000 (17:48 -0800)]
am
b6c2b1c6: Fix SDK connectivity.
* commit '
b6c2b1c62706689410b5d3818aacd6d3103b9b7a':
Fix SDK connectivity.
Robert Greenwalt [Tue, 25 Jan 2011 00:32:18 +0000 (16:32 -0800)]
Fix SDK connectivity.
Re-add the phone apk to the sdk build.
bug:
3380122
Change-Id: I0b011557aba95fbe9be24d4356eddde4b163b80f
Scott Main [Mon, 24 Jan 2011 22:22:03 +0000 (14:22 -0800)]
am
8f87f959: am
bbe78df1: (-s ours) am
05d14cb9: Merge "don\'t use the sdkdoc template if the index file is a preview (the features.html doc is no longer used, so removed check for that also)" into gingerbread
* commit '
8f87f959069ea1d3721aa8df81bf0efce6d9bbd4':
don't use the sdkdoc template if the index file is a preview (the features.html doc is no longer used, so removed check for that also)
Scott Main [Mon, 24 Jan 2011 22:19:01 +0000 (14:19 -0800)]
am
bbe78df1: (-s ours) am
05d14cb9: Merge "don\'t use the sdkdoc template if the index file is a preview (the features.html doc is no longer used, so removed check for that also)" into gingerbread
* commit '
bbe78df17831981200e1a906bb759492b5d5ae85':
don't use the sdkdoc template if the index file is a preview (the features.html doc is no longer used, so removed check for that also)
Jean-Baptiste Queru [Mon, 24 Jan 2011 21:29:15 +0000 (13:29 -0800)]
am
8b30f1e1: (-s ours) am
fce88928: (-s ours) Revert "Merge commit \'
50738779\' into gingerbread-plus-aosp" - do not merge
* commit '
8b30f1e174b3c05ce2faf4e709c8bccd9d596ba1':
Revert "Merge commit '
50738779' into gingerbread-plus-aosp" - do not merge
Ying Wang [Mon, 24 Jan 2011 18:59:15 +0000 (10:59 -0800)]
Merge "Add modifier goal incrementaljavac"
Jean-Baptiste Queru [Mon, 24 Jan 2011 08:02:17 +0000 (00:02 -0800)]
am
fce88928: (-s ours) Revert "Merge commit \'
50738779\' into gingerbread-plus-aosp" - do not merge
* commit '
fce88928fef25777a0e409e2ed6e19fe0da0b8c6':
Revert "Merge commit '
50738779' into gingerbread-plus-aosp" - do not merge
The Android Automerger [Mon, 24 Jan 2011 07:34:23 +0000 (23:34 -0800)]
resolved conflicts for merge of
b5952289 to master
Change-Id: I792d34aed36200b85512aadc212503a3c1da140f
The Android Automerger [Mon, 24 Jan 2011 07:25:47 +0000 (23:25 -0800)]
resolved conflicts for merge of
733ce0d0 to honeycomb-plus-aosp
Change-Id: Ic962c4e2611c31af1da96269d70216b27aa3a18d
Brian Swetland [Mon, 24 Jan 2011 02:56:08 +0000 (18:56 -0800)]
make TINY_ANDROID build without the presence of frameworks/* and development/*
Change-Id: I795e27a9ce837b193c6d8d0516e2f523c17214e2
Brian Swetland [Mon, 24 Jan 2011 01:06:58 +0000 (17:06 -0800)]
tiny android: include su
Change-Id: Ib8162c0f8171114ffafcac48d482fd3acd5d5956
Dianne Hackborn [Sun, 23 Jan 2011 22:49:02 +0000 (14:49 -0800)]
DO NOT MERGE. Hello, Android 3.0 API 11.
Change-Id: Id859b752fc87fd050005c32665f2f019e177cf95
Doug Zongker [Sun, 23 Jan 2011 20:57:19 +0000 (12:57 -0800)]
check syntax of description field in logtags files
EventLog.java checks that the field descriptions are bracketed by
parens, so we should to in order to avoid a runtime error from a
logtag entry with bad syntax.
Bug:
3381309
Change-Id: I1d4cbb190da6b81ec0b1f1de9b5bc3f3394d7ec1
Ying Wang [Thu, 20 Jan 2011 23:01:56 +0000 (15:01 -0800)]
Add modifier goal incrementaljavac
With "incrementaljavac" on your make command line, you will recompile
only Java source files that have been changed since last build.
Nothing is changed if "incrementaljavac" is not among your make goals.
Change-Id: Iae591459827df81ac91e95292464db5e9828343a
Ed Heyl [Sat, 22 Jan 2011 01:44:01 +0000 (17:44 -0800)]
am
1d4e3fde: (-s ours) am
7e1ce27c: Merge commit \'
50738779\' into gingerbread-plus-aosp
* commit '
1d4e3fdeb4d31c12e0d533eb50e335691a4956dc':
DO NOT MERGE Fix issue #
3373438: Update GBMR versions
Ed Heyl [Sat, 22 Jan 2011 01:41:23 +0000 (17:41 -0800)]
am
7e1ce27c: Merge commit \'
50738779\' into gingerbread-plus-aosp
* commit '
7e1ce27c08ec57032520613488ec2fe5b3795126':
DO NOT MERGE Fix issue #
3373438: Update GBMR versions
Amith Yamasani [Fri, 21 Jan 2011 22:53:45 +0000 (14:53 -0800)]
am
9bb0fd94: am
1fd97c38: Clean the build.prop so that default notification sound is set properly.
* commit '
9bb0fd945f1de27712e540ce425fa5fd48ebf236':
Clean the build.prop so that default notification sound is set properly.
Amith Yamasani [Fri, 21 Jan 2011 22:51:41 +0000 (14:51 -0800)]
am
1fd97c38: Clean the build.prop so that default notification sound is set properly.
* commit '
1fd97c38b00786c61e7befb709a008c214988023':
Clean the build.prop so that default notification sound is set properly.
Eric Fischer [Fri, 21 Jan 2011 22:40:26 +0000 (14:40 -0800)]
am
e6e583ff: am
7dfc1270: am
54a6b731: Merge "Flesh out the languages_full list with recently added locales." into gingerbread
* commit '
e6e583ffab4fd272ceb0c190223dd9e710336542':
Flesh out the languages_full list with recently added locales.
Eric Fischer [Fri, 21 Jan 2011 22:37:20 +0000 (14:37 -0800)]
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.
Amith Yamasani [Fri, 21 Jan 2011 21:59:53 +0000 (13:59 -0800)]
Clean the build.prop so that default notification sound is set properly.
Bug:
3349429
Change-Id: I44450a4cc9acdeffa42340c61088a5964fa6ee0d
Scott Main [Fri, 21 Jan 2011 20:34:06 +0000 (12:34 -0800)]
am
05d14cb9: Merge "don\'t use the sdkdoc template if the index file is a preview (the features.html doc is no longer used, so removed check for that also)" into gingerbread
* commit '
05d14cb9f03044e11f7c056dae1e576bb5cd3716':
don't use the sdkdoc template if the index file is a preview (the features.html doc is no longer used, so removed check for that also)
Scott Main [Fri, 21 Jan 2011 20:00:51 +0000 (12:00 -0800)]
Merge "don't use the sdkdoc template if the index file is a preview (the features.html doc is no longer used, so removed check for that also)" into gingerbread
Scott Main [Fri, 21 Jan 2011 19:58:56 +0000 (11:58 -0800)]
don't use the sdkdoc template if the index file is a preview
(the features.html doc is no longer used, so removed check for that also)
Change-Id: I1985b2e48060337030df53c19051ea363cb3b700
Jean-Baptiste Queru [Fri, 21 Jan 2011 19:01:47 +0000 (11:01 -0800)]
am
43b1bb5b: (-s ours) (Re-)Set version names for AOSP master - do not merge
* commit '
43b1bb5be1e43ad8d430540e395c2216ace6c2a4':
(Re-)Set version names for AOSP master - do not merge
Jean-Baptiste Queru [Fri, 21 Jan 2011 15:59:40 +0000 (07:59 -0800)]
(Re-)Set version names for AOSP master - do not merge
Change-Id: I0973090ebf00a9e0deb8ec2beb0f39fa93bc03c1
Jean-Baptiste Queru [Fri, 21 Jan 2011 15:49:35 +0000 (07:49 -0800)]
Revert "Merge commit '
50738779' into gingerbread-plus-aosp" - do not merge
This reverts commit
7e1ce27c08ec57032520613488ec2fe5b3795126, reversing
changes made to
7dfc1270967c96be6dcd58fb7770c07482a7e90d.
Change-Id: I2b4c33ad56a12612f2fc05845428409d7023f683
Ed Heyl [Fri, 21 Jan 2011 02:08:34 +0000 (18:08 -0800)]
Merge commit '
50738779' into gingerbread-plus-aosp
Conflicts:
core/version_defaults.mk
Change-Id: I69ae9d5b3e0532c67c401a8320e69aab5ee66b0f
Brian Swetland [Fri, 21 Jan 2011 01:12:33 +0000 (17:12 -0800)]
am
cb6fbf88: am
a7600364: fix tiny android build
* commit '
cb6fbf88db9e29f761045dbe9ece975f178ff71e':
fix tiny android build
Brian Swetland [Fri, 21 Jan 2011 01:07:27 +0000 (17:07 -0800)]
am
a7600364: fix tiny android build
* commit '
a7600364feb0eff313374e9dd0502ea7e15085f6':
fix tiny android build
Brian Swetland [Thu, 20 Jan 2011 23:33:23 +0000 (15:33 -0800)]
fix tiny android build
Change-Id: Ifa6cda67f54969588b5c4e9f900ac2d4ba607e71
Signed-off-by: Brian Swetland <swetland@google.com>
Dianne Hackborn [Thu, 20 Jan 2011 20:17:41 +0000 (12:17 -0800)]
DO NOT MERGE Fix issue #
3373438: Update GBMR versions
Change-Id: Ia334babece0d3cecb19da8ddd240ee300d0ac3ac
Michael Chan [Thu, 20 Jan 2011 05:21:10 +0000 (21:21 -0800)]
Michael Chan [Thu, 20 Jan 2011 05:19:39 +0000 (21:19 -0800)]
am
b43ac8fc: Fix build break
* commit '
b43ac8fc2fbb3530212a613108c2492969e33146':
Fix build break
Michael Chan [Thu, 20 Jan 2011 05:12:41 +0000 (21:12 -0800)]
Fix build break
Change-Id: Ie07f042a9f25bf3329cf2cea8fdeea3e208da775
Ken Sumrall [Thu, 20 Jan 2011 01:47:08 +0000 (17:47 -0800)]
am
77b01a8c: am
6f2f23a4: Merge "Teach the build system to reserve the last 16 Kbytes of /data for the crypto footer" into honeycomb
* commit '
77b01a8c2230a7467979d8ab56c0a65c1d6b0640':
Teach the build system to reserve the last 16 Kbytes of /data for the crypto footer
Ken Sumrall [Thu, 20 Jan 2011 01:39:46 +0000 (17:39 -0800)]
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
Ken Sumrall [Thu, 20 Jan 2011 01:35:30 +0000 (17:35 -0800)]
Merge "Teach the build system to reserve the last 16 Kbytes of /data for the crypto footer" into honeycomb
Ken Sumrall [Thu, 20 Jan 2011 01:08:54 +0000 (17:08 -0800)]
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
Ying Wang [Wed, 19 Jan 2011 22:41:25 +0000 (14:41 -0800)]
am
4d3ac24d: am
84ed6fa2: Disable "-t" for acp.
* commit '
4d3ac24dafab161a44fddb1039159b1b484f5841':
Disable "-t" for acp.
Ying Wang [Wed, 19 Jan 2011 22:38:00 +0000 (14:38 -0800)]
am
84ed6fa2: Disable "-t" for acp.
* commit '
84ed6fa27b883de8ba7b41ddecaa2179e7f4b321':
Disable "-t" for acp.
Ying Wang [Wed, 19 Jan 2011 01:21:20 +0000 (17:21 -0800)]
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
Ying Wang [Wed, 19 Jan 2011 20:05:32 +0000 (12:05 -0800)]
am
df3a8ab5: am
85aa5ded: Add external/clang/lib/Headers as llvm-rs-cc\'s system header search path
* commit '
df3a8ab5aa32ca470774939b0fde5111faf5320b':
Add external/clang/lib/Headers as llvm-rs-cc's system header search path
Ying Wang [Wed, 19 Jan 2011 20:03:22 +0000 (12:03 -0800)]
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
Ying Wang [Wed, 19 Jan 2011 19:49:21 +0000 (11:49 -0800)]
Add external/clang/lib/Headers as llvm-rs-cc's system header search path
Change-Id: I30257631d484491d9a8346205e411013c76c5a91
Bug:
2943524
Ying Wang [Wed, 19 Jan 2011 18:35:02 +0000 (10:35 -0800)]
am
04a4d9ad: am
04e1f31d: Move videoeditor libraries to generic_no_telephony.mk.
* commit '
04a4d9ade8c3ac18476c0f5a934e4efc6365fee8':
Move videoeditor libraries to generic_no_telephony.mk.
Ying Wang [Wed, 19 Jan 2011 18:33:12 +0000 (10:33 -0800)]
am
04e1f31d: Move videoeditor libraries to generic_no_telephony.mk.
* commit '
04e1f31dfdf7511cb8f5dbdf0376651fbb783fa2':
Move videoeditor libraries to generic_no_telephony.mk.
Ying Wang [Wed, 19 Jan 2011 18:28:05 +0000 (10:28 -0800)]
Move videoeditor libraries to generic_no_telephony.mk.
Change-Id: I8ea2058b79ccfda3114ba64b4e43c175a0fe086c
Kristian Monsen [Wed, 19 Jan 2011 11:24:54 +0000 (03:24 -0800)]
am
def863f7: am
da7575bc: Making more space for libwebcore.so
* commit '
def863f719be1a6a1f4725b77f64df2f2526584b':
Making more space for libwebcore.so
Kristian Monsen [Wed, 19 Jan 2011 11:22:36 +0000 (03:22 -0800)]
am
da7575bc: Making more space for libwebcore.so
* commit '
da7575bc70ace95aba75f40f79ed46b4ab1a9913':
Making more space for libwebcore.so
Rebecca Schultz Zavin [Wed, 19 Jan 2011 05:52:44 +0000 (21:52 -0800)]
am
1ec15e1e: am
d64f0edd: Merge "Include batch in legacy prebuilts with tcmd and ftmipcd." into honeycomb
* commit '
1ec15e1e837212f1e90e0b1b52b05f35a8024c94':
Include batch in legacy prebuilts with tcmd and ftmipcd.
Eric Fischer [Tue, 18 Jan 2011 23:35:46 +0000 (15:35 -0800)]
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.
Eric Fischer [Tue, 18 Jan 2011 23:33:39 +0000 (15:33 -0800)]
Merge "Flesh out the languages_full list with recently added locales." into gingerbread
Kristian Monsen [Mon, 17 Jan 2011 16:57:53 +0000 (16:57 +0000)]
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
Rebecca Schultz Zavin [Tue, 18 Jan 2011 21:48:42 +0000 (13:48 -0800)]
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.
Rebecca Schultz Zavin [Tue, 18 Jan 2011 21:46:47 +0000 (13:46 -0800)]
Merge "Include batch in legacy prebuilts with tcmd and ftmipcd." into honeycomb
James Wilson [Tue, 11 Jan 2011 23:13:22 +0000 (17:13 -0600)]
Include batch in legacy prebuilts with tcmd and ftmipcd.
Change-Id: Iad6d7974bfadd3467270033f982de0642657d472
Signed-off-by: James Wilson <james.wilson@motorola.com>
Shih-wei Liao [Tue, 18 Jan 2011 19:18:27 +0000 (11:18 -0800)]
am
500c0537: am
10aab0ef: Merge "Remove libbcc and libLLVM* from the grand-fathered modules." into honeycomb
* commit '
500c053777494927929999d48df6aa5b01847ec8':
Remove libbcc and libLLVM* from the grand-fathered modules.
Shih-wei Liao [Tue, 18 Jan 2011 19:15:36 +0000 (11:15 -0800)]
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.
Shih-wei Liao [Tue, 18 Jan 2011 19:04:00 +0000 (11:04 -0800)]
Merge "Remove libbcc and libLLVM* from the grand-fathered modules." into honeycomb
Xavier Ducrohet [Tue, 18 Jan 2011 18:22:48 +0000 (10:22 -0800)]
am
155776bf: am
a17fe58b: Update SDK app list.
* commit '
155776bf06ece56db27abf84da9cbe5260c2cf36':
Update SDK app list.
Xavier Ducrohet [Tue, 18 Jan 2011 18:20:22 +0000 (10:20 -0800)]
am
a17fe58b: Update SDK app list.
* commit '
a17fe58b4662a49213250aa988f3ad446b92a6d4':
Update SDK app list.
Xavier Ducrohet [Tue, 18 Jan 2011 02:22:51 +0000 (18:22 -0800)]
Update SDK app list.
Change-Id: I1a99b0bd716f90688aea9b9db20e393a91ad8ad2
Ying Wang [Tue, 18 Jan 2011 17:56:20 +0000 (09:56 -0800)]
am
fa2aca54: am
4162f45c: Merge "Don\'t increase image sizes for the release tools." into honeycomb
* commit '
fa2aca54b215c51e4d5cf21f1e16b26adbbe57d2':
Don't increase image sizes for the release tools.
Ying Wang [Tue, 18 Jan 2011 17:54:53 +0000 (09:54 -0800)]
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.
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.
Ying Wang [Tue, 18 Jan 2011 17:52:07 +0000 (09:52 -0800)]
Merge "Don't increase image sizes for the release tools." into honeycomb
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
Shih-wei Liao [Mon, 17 Jan 2011 09:13:42 +0000 (01:13 -0800)]
Remove libbcc and libLLVM* from the grand-fathered modules.
Change-Id: I7030cdbe6e51c42a4053d7ab8a47a705bff72be7
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.