OSDN Git Service

android-x86/build.git
13 years agoam 020e2fc1: (-s ours) am 928a0304: re-merge from readonly-korg-master - do not merge
Jean-Baptiste Queru [Thu, 27 Jan 2011 17:26:44 +0000 (09:26 -0800)]
am 020e2fc1: (-s ours) am 928a0304: re-merge from readonly-korg-master - do not merge

* commit '020e2fc14a28d6fd449fa37cf8bcbd4b0675238a':
  re-merge from readonly-korg-master - do not merge

13 years agoam 928a0304: re-merge from readonly-korg-master - do not merge
Jean-Baptiste Queru [Thu, 27 Jan 2011 17:24:43 +0000 (09:24 -0800)]
am 928a0304: re-merge from readonly-korg-master - do not merge

* commit '928a03043187b7c4843b2c832b589c57b7541e4a':
  re-merge from readonly-korg-master - do not merge

13 years agore-merge from readonly-korg-master - do not merge
Jean-Baptiste Queru [Thu, 27 Jan 2011 16:26:25 +0000 (08:26 -0800)]
re-merge from readonly-korg-master - do not merge

Change-Id: Ifc1e39261e1fcaefc1e314d994e71115624643a2

13 years agoam 46b944dd: (-s ours) am 1fe74722: am 4a91aa9b: (-s ours) Merge "Add a few more...
Jean-Baptiste Queru [Thu, 27 Jan 2011 16:58:16 +0000 (08:58 -0800)]
am 46b944dd: (-s ours) am 1fe74722: am 4a91aa9b: (-s ours) Merge "Add a few more legacy modules that can have user tags - do not merge"

* commit '46b944dd76cfc752a23acd98d00c681fb2c22864':
  Add a few more legacy modules that can have user tags - do not merge

13 years agoam 1fe74722: am 4a91aa9b: (-s ours) Merge "Add a few more legacy modules that can...
Jean-Baptiste Queru [Thu, 27 Jan 2011 16:55:43 +0000 (08:55 -0800)]
am 1fe74722: am 4a91aa9b: (-s ours) Merge "Add a few more legacy modules that can have user tags - do not merge"

* commit '1fe74722b608a66381d186b32b2fb59d254194c7':
  Add a few more legacy modules that can have user tags - do not merge

13 years agoam 4a91aa9b: (-s ours) Merge "Add a few more legacy modules that can have user tags...
Jean-Baptiste Queru [Thu, 27 Jan 2011 16:53:44 +0000 (08:53 -0800)]
am 4a91aa9b: (-s ours) Merge "Add a few more legacy modules that can have user tags - do not merge"

* commit '4a91aa9b40d2bffdab04323d100fad3a0e3e6ecc':
  Add a few more legacy modules that can have user tags - do not merge

13 years agoMerge "Add a few more legacy modules that can have user tags - do not merge"
Jean-Baptiste Queru [Thu, 27 Jan 2011 16:26:25 +0000 (08:26 -0800)]
Merge "Add a few more legacy modules that can have user tags - do not merge"

13 years agoAdd a few more legacy modules that can have user tags - do not merge
Jean-Baptiste Queru [Thu, 27 Jan 2011 16:18:41 +0000 (08:18 -0800)]
Add a few more legacy modules that can have user tags - do not merge

Change-Id: I198d3eb34958e46ccba145bd05452027cba5e464

13 years agoam bb219fc3: 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

13 years agoAdd 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

13 years agoam 55d93284: 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

13 years agosupport 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

13 years agoam b6c2b1c6: 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.

13 years agoFix 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

13 years agoam bbe78df1: (-s ours) am 05d14cb9: Merge "don\'t use the sdkdoc template if the...
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)

13 years agoam fce88928: (-s ours) Revert "Merge commit \'50738779\' into gingerbread-plus-aosp...
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

13 years agoresolved conflicts for merge of 733ce0d0 to honeycomb-plus-aosp
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

13 years agoDO NOT MERGE. Hello, Android 3.0 API 11.
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

13 years agoam 7e1ce27c: Merge commit \'50738779\' into gingerbread-plus-aosp
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

13 years agoam 1fd97c38: 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.

13 years agoam 7dfc1270: am 54a6b731: Merge "Flesh out the languages_full list with recently...
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.

13 years agoClean the build.prop so that default notification sound is set properly.
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

13 years agoam 05d14cb9: Merge "don\'t use the sdkdoc template if the index file is a preview...
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)

13 years agoMerge "don't use the sdkdoc template if the index file is a preview (the features...
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

13 years agodon't use the sdkdoc template if the index file is a preview
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

13 years ago(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

13 years agoRevert "Merge commit '50738779' into gingerbread-plus-aosp" - do not merge
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

13 years agoMerge commit '50738779' into gingerbread-plus-aosp
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

13 years agoam a7600364: 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

13 years agofix 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>
13 years agoDO NOT MERGE Fix issue #3373438: Update GBMR versions
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

13 years agoam b43ac8fc: Fix build break
Michael Chan [Thu, 20 Jan 2011 05:19:39 +0000 (21:19 -0800)]
am b43ac8fc: Fix build break

* commit 'b43ac8fc2fbb3530212a613108c2492969e33146':
  Fix build break

13 years agoFix build break
Michael Chan [Thu, 20 Jan 2011 05:12:41 +0000 (21:12 -0800)]
Fix build break

Change-Id: Ie07f042a9f25bf3329cf2cea8fdeea3e208da775

13 years agoam 6f2f23a4: Merge "Teach the build system to reserve the last 16 Kbytes of /data...
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

13 years agoMerge "Teach the build system to reserve the last 16 Kbytes of /data for the crypto...
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

13 years agoTeach the build system to reserve the last 16 Kbytes of /data for the crypto footer
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

13 years agoam 84ed6fa2: 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.

13 years agoDisable "-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

13 years agoam 85aa5ded: Add external/clang/lib/Headers as llvm-rs-cc\'s system header search...
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

13 years agoAdd 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

13 years agoam 04e1f31d: 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.

13 years agoMove 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

13 years agoam da7575bc: 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

13 years agoam 54a6b731: Merge "Flesh out the languages_full list with recently added locales...
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.

13 years agoMerge "Flesh out the languages_full list with recently added locales." into gingerbread
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

13 years agoMaking more space for libwebcore.so
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

13 years agoam d64f0edd: Merge "Include batch in legacy prebuilts with tcmd and ftmipcd." into...
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.

13 years agoMerge "Include batch in legacy prebuilts with tcmd and ftmipcd." into honeycomb
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

13 years agoInclude batch in legacy prebuilts with tcmd and ftmipcd.
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>
13 years agoam 10aab0ef: Merge "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.

13 years agoMerge "Remove libbcc and libLLVM* from the grand-fathered modules." into honeycomb
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

13 years agoam a17fe58b: 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.

13 years agoUpdate SDK app list.
Xavier Ducrohet [Tue, 18 Jan 2011 02:22:51 +0000 (18:22 -0800)]
Update SDK app list.

Change-Id: I1a99b0bd716f90688aea9b9db20e393a91ad8ad2

13 years agoam 4162f45c: Merge "Don\'t increase image sizes for the release tools." into honeycomb
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.

13 years agoam aafe93b1: Merge "Add librs_jni to the sdk product packages." into honeycomb
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.

13 years agoMerge "Don't increase image sizes for the release tools." into honeycomb
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

13 years agoMerge "Add librs_jni to the sdk product packages." 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

13 years agoam 58286dcd: fix build
Scott Main [Tue, 18 Jan 2011 16:24:00 +0000 (08:24 -0800)]
am 58286dcd: fix build

* commit '58286dcd1f065b8170303874eb5ff07b6c590232':
  fix build

13 years agoreovle conflicts for cc089099
shared_user android-merger-prebuild [Tue, 18 Jan 2011 16:21:32 +0000 (08:21 -0800)]
reovle conflicts for cc089099

Change-Id: Ia449a3a3dc13928afb5c6ab6f4dcdf6eb049372b

13 years agoresolved conflicts for merge 7bc0fb1b to honeycomb-plus-aosp
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

13 years agofix build
Scott Main [Tue, 18 Jan 2011 02:23:21 +0000 (18:23 -0800)]
fix build

Change-Id: If4adf6b91b932f44c5456bd76fed968e9d84c556

13 years agoam c86bcf5f: Merge "add videoeditor libraries to make" into honeycomb
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

13 years agoupdate sdk template... thought this was merged already,
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

13 years agoAdd librs_jni to the sdk product packages.
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

13 years agodocs: revise preview statement and links
Scott Main [Tue, 18 Jan 2011 00:15:19 +0000 (16:15 -0800)]
docs: revise preview statement and links

Change-Id: I9c0bde91c2c87c661fe877608a48a5bd577860f3

13 years agoMerge "add videoeditor libraries to make" into honeycomb
Dharmaray Kundargi [Mon, 17 Jan 2011 18:52:26 +0000 (10:52 -0800)]
Merge "add videoeditor libraries to make" into honeycomb

13 years agoRemove libbcc and libLLVM* from the grand-fathered modules.
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

13 years agoadd videoeditor libraries to make
Dharmaray Kundargi [Mon, 17 Jan 2011 00:45:20 +0000 (16:45 -0800)]
add videoeditor libraries to make

Change-Id: I024f087bd026f709fdbfc1272c79166ad9bf5bcd

13 years agoam 1fa29fc9: Merge "Add librs_jni to the generic product packages." into honeycomb
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.

13 years agoMerge "Add librs_jni to the generic product packages." into honeycomb
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

13 years agoAdd librs_jni to the generic product packages.
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

13 years agoam 6efeec6a: am 755bed4c: Merge "Add support for custom Linux host toolchains when...
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.

13 years agoam 755bed4c: Merge "Add support for custom Linux host toolchains when building the...
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.

13 years agoMerge "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."

13 years agoam 68404ba4: Bump API version up to 10, thus resource version up to 11.
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.

13 years agoBump 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

13 years agoAdd support for custom Linux host toolchains when building the SDK.
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

13 years agoam 8e9d20b3: am 27016763: merge from gingerbread
Jean-Baptiste Queru [Sat, 15 Jan 2011 05:30:10 +0000 (21:30 -0800)]
am 8e9d20b3: am 27016763: merge from gingerbread

* commit '8e9d20b3c4c78cf04db9d1bef8a1438f848cd944':

13 years agoam 27016763: merge from gingerbread
Jean-Baptiste Queru [Sat, 15 Jan 2011 01:12:54 +0000 (17:12 -0800)]
am 27016763: merge from gingerbread

* commit '27016763c7c0e568fb8eb26ab3d30282f027a72d':

13 years agomerge from gingerbread
Jean-Baptiste Queru [Sat, 15 Jan 2011 01:09:06 +0000 (17:09 -0800)]
merge from gingerbread

Change-Id: I05a6bed8b7275114ce545a7a45f2e13bf5469ec0

13 years agoFlesh out the languages_full list with recently added locales.
Eric Fischer [Fri, 14 Jan 2011 23:23:23 +0000 (15:23 -0800)]
Flesh out the languages_full list with recently added locales.

Change-Id: I8c43feba15f03e0b204b2d3ef136ea6e6e2e4fe2

13 years agoam 4125d8ee: am a4781e86: Merge from open-source gingerbread
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.

13 years agoam a4781e86: Merge from open-source gingerbread
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.

13 years agoMerge from open-source gingerbread
Jean-Baptiste Queru [Fri, 14 Jan 2011 21:27:31 +0000 (13:27 -0800)]
Merge from open-source gingerbread

Change-Id: I7dce3075bab5831b48a66ef43a32a2be82eda19a

13 years agoMerge "CTS: pass vogar expectation location to CollectAllTests." into gingerbread
Jean-Baptiste Queru [Fri, 14 Jan 2011 20:46:35 +0000 (12:46 -0800)]
Merge "CTS: pass vogar expectation location to CollectAllTests." into gingerbread

13 years agoresolved conflicts for merge of 08b96428 to honeycomb-plus-aosp
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

13 years agoDon't increase image sizes for the release tools.
Ying Wang [Fri, 14 Jan 2011 19:30:56 +0000 (11:30 -0800)]
Don't increase image sizes for the release tools.

So it keeps consistent with the command run in the makefile.

Change-Id: Id26fa3387aa9bbab88c4ef3fbd26aff0d039c2e1

13 years agoam 66888a7c: docs: update the sdk doc template to remove a bunch of obsolete things...
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

13 years agodocs: update the sdk doc template to remove a bunch of obsolete
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

13 years agoam 23d3dedb: Merge "Add llvm-rs-cc to the tools buildable under Windows." into honeycomb
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.

13 years agoMerge "Add llvm-rs-cc to the tools buildable under Windows." into honeycomb
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

13 years agoam 0a53dc49: docs: make only the expando link not-underlined and wait until close...
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

13 years agodocs: make only the expando link not-underlined
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

13 years agoam e5781194: docs: implement toggle features for documentation content. There existed...
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.

13 years agodocs: implement toggle features for documentation content.
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

13 years agoAdd llvm-rs-cc to the tools buildable under Windows.
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

13 years agoam 94978cf4: Disable dexpreopt for unbundled build.
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.

13 years agoDisable 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

13 years agoam 79609e35: am a712543e: Don\'t prepend ./ before the dirs to be removed
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

13 years agoDoc change: Remove redundant dir and image.
Dirk Dougherty [Sat, 8 Jan 2011 01:07:43 +0000 (17:07 -0800)]
Doc change: Remove redundant dir and image.

Change-Id: I6867250f48b71d857b1cf80f28392ec9879005c7