Commit Graph

4442 Commits

Author SHA1 Message Date
Doug Zongker
55d932840f 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
2011-01-25 17:07:09 -08:00
Ying Wang
80e6cce93e Correct misuse of target/host vars.
Change-Id: Ide41aeddc44ca05d85a36035c2d55ea453cfd216
2011-01-24 23:25:36 -08:00
Robert Greenwalt
824bc51ee8 am 75e557d1: am b6c2b1c6: Fix SDK connectivity.
* commit '75e557d11331afaca818ec60a75c3a62253d9542':
  Fix SDK connectivity.
2011-01-24 17:51:14 -08:00
Robert Greenwalt
75e557d113 am b6c2b1c6: Fix SDK connectivity.
* commit 'b6c2b1c62706689410b5d3818aacd6d3103b9b7a':
  Fix SDK connectivity.
2011-01-24 17:48:52 -08:00
Robert Greenwalt
b6c2b1c627 Fix SDK connectivity.
Re-add the phone apk to the sdk build.

bug:3380122
Change-Id: I0b011557aba95fbe9be24d4356eddde4b163b80f
2011-01-24 16:32:18 -08:00
Scott Main
17b1b3bf18 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)
2011-01-24 14:22:03 -08:00
Scott Main
8f87f95906 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)
2011-01-24 14:19:01 -08:00
Jean-Baptiste Queru
7eb54c8629 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
2011-01-24 13:29:15 -08:00
Ying Wang
3d85bbd288 Merge "Add modifier goal incrementaljavac" 2011-01-24 10:59:15 -08:00
Jean-Baptiste Queru
8b30f1e174 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
2011-01-24 00:02:17 -08:00
The Android Automerger
97f3f08622 resolved conflicts for merge of b5952289 to master
Change-Id: I792d34aed36200b85512aadc212503a3c1da140f
2011-01-23 23:34:23 -08:00
The Android Automerger
b5952289e2 resolved conflicts for merge of 733ce0d0 to honeycomb-plus-aosp
Change-Id: Ic962c4e2611c31af1da96269d70216b27aa3a18d
2011-01-23 23:25:47 -08:00
Brian Swetland
7cc2440994 make TINY_ANDROID build without the presence of frameworks/* and development/*
Change-Id: I795e27a9ce837b193c6d8d0516e2f523c17214e2
2011-01-23 18:56:08 -08:00
Brian Swetland
72bf09d333 tiny android: include su
Change-Id: Ib8162c0f8171114ffafcac48d482fd3acd5d5956
2011-01-23 17:06:58 -08:00
Dianne Hackborn
733ce0d0cc DO NOT MERGE. Hello, Android 3.0 API 11.
Change-Id: Id859b752fc87fd050005c32665f2f019e177cf95
2011-01-23 14:49:02 -08:00
Doug Zongker
e128cbda07 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
2011-01-23 12:57:19 -08:00
Ying Wang
015edd2c1b 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
2011-01-21 17:49:30 -08:00
Ed Heyl
7838fa6e9c am 1d4e3fde: (-s ours) am 7e1ce27c: Merge commit \'50738779\' into gingerbread-plus-aosp
* commit '1d4e3fdeb4d31c12e0d533eb50e335691a4956dc':
  DO NOT MERGE Fix issue #3373438: Update GBMR versions
2011-01-21 17:44:01 -08:00
Ed Heyl
1d4e3fdeb4 am 7e1ce27c: Merge commit \'50738779\' into gingerbread-plus-aosp
* commit '7e1ce27c08ec57032520613488ec2fe5b3795126':
  DO NOT MERGE Fix issue #3373438: Update GBMR versions
2011-01-21 17:41:23 -08:00
Amith Yamasani
e183a52062 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.
2011-01-21 14:53:45 -08:00
Amith Yamasani
9bb0fd945f 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.
2011-01-21 14:51:41 -08:00
Eric Fischer
59ef5747bf 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.
2011-01-21 14:40:26 -08:00
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
Amith Yamasani
1fd97c38b0 Clean the build.prop so that default notification sound is set properly.
Bug: 3349429
Change-Id: I44450a4cc9acdeffa42340c61088a5964fa6ee0d
2011-01-21 13:59:53 -08:00
Scott Main
bbe78df178 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)
2011-01-21 12:34:06 -08:00
Scott Main
05d14cb9f0 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 2011-01-21 12:00:51 -08:00
Scott Main
42d1d32aa0 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
2011-01-21 11:58:56 -08:00
Jean-Baptiste Queru
57411a5ef1 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
2011-01-21 11:01:47 -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
Jean-Baptiste Queru
fce88928fe Revert "Merge commit '50738779' into gingerbread-plus-aosp" - do not merge
This reverts commit 7e1ce27c08, reversing
changes made to 7dfc127096.

Change-Id: I2b4c33ad56a12612f2fc05845428409d7023f683
2011-01-21 07:50:36 -08:00
Ed Heyl
7e1ce27c08 Merge commit '50738779' into gingerbread-plus-aosp
Conflicts:
	core/version_defaults.mk

Change-Id: I69ae9d5b3e0532c67c401a8320e69aab5ee66b0f
2011-01-20 18:08:34 -08:00
Brian Swetland
4d9fee9e9c am cb6fbf88: am a7600364: fix tiny android build
* commit 'cb6fbf88db9e29f761045dbe9ece975f178ff71e':
  fix tiny android build
2011-01-20 17:12:33 -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
Dianne Hackborn
50738779d9 DO NOT MERGE Fix issue #3373438: Update GBMR versions
Change-Id: Ia334babece0d3cecb19da8ddd240ee300d0ac3ac
2011-01-20 12:17:41 -08:00
Michael Chan
e1e5c2fdd3 am 87762c7e: am b43ac8fc: Fix build break
* commit '87762c7e1f5473b8ff51c2cf30d3d5c47d67642a':
  Fix build break
2011-01-19 21:21:10 -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
2eef425167 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
2011-01-19 17:47:08 -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
ea482c78e3 am 4d3ac24d: am 84ed6fa2: Disable "-t" for acp.
* commit '4d3ac24dafab161a44fddb1039159b1b484f5841':
  Disable "-t" for acp.
2011-01-19 14:41:25 -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
49086372f7 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
2011-01-19 12:05:32 -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
611a4b25c1 am 04a4d9ad: am 04e1f31d: Move videoeditor libraries to generic_no_telephony.mk.
* commit '04a4d9ade8c3ac18476c0f5a934e4efc6365fee8':
  Move videoeditor libraries to generic_no_telephony.mk.
2011-01-19 10:35:02 -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