Commit Graph

1156 Commits

Author SHA1 Message Date
Jeff Brown e33ba4c49e Remove the simulator target from all makefiles.
Bug: 5010576

Change-Id: Ie814f4c8d3aa1e7cc7f5735822ab25542f36cf62
2011-07-11 23:51:37 -07:00
Scott Main 84c11c2605 am 7c32eeba: am 040221a9: am 1e03253b: Merge "docs: fix xss vulnerability bug 5008593" into honeycomb-mr2
* commit '7c32eebac5bc5811f95bf2209ad80fcc6ebb550a':
  docs: fix xss vulnerability bug 5008593
2011-07-11 17:09:48 -07:00
Joe Malin 2ed3603ad9 am dcca65cb: am 2c97d30f: am 8cf99f0c: DOC CHANGE: Change GTV icons for home page
* commit 'dcca65cb1d1ca1ae108b417ebd7241f397012b45':
  DOC CHANGE: Change GTV icons for home page
2011-07-08 17:53:03 -07:00
Scott Main 7c32eebac5 am 040221a9: am 1e03253b: Merge "docs: fix xss vulnerability bug 5008593" into honeycomb-mr2
* commit '040221a9949c9f158cb7fc20b70b065289fcbbb1':
  docs: fix xss vulnerability bug 5008593
2011-07-08 17:45:38 -07:00
Scott Main 1e03253bf2 Merge "docs: fix xss vulnerability bug 5008593" into honeycomb-mr2 2011-07-08 17:42:40 -07:00
Scott Main 76a62f2deb docs: fix xss vulnerability
bug 5008593

the fix deletes some code that was originally there to handle side nav
highlighting for inter-doc links. This code is no longer necessary (or at least
should not be) because side nav links should not be inter-doc links, but
should always be to their own document (no two sidenav links should go
to separate sections of the same doc).

Change-Id: If77d6fe869e6a44bae2f194c9de26222e6ad9419
2011-07-08 16:27:20 -07:00
Joe Malin dcca65cb1d am 2c97d30f: am 8cf99f0c: DOC CHANGE: Change GTV icons for home page
* commit '2c97d30fefed3430daa356418146d2cbb1f23c8f':
  DOC CHANGE: Change GTV icons for home page
2011-07-08 10:38:37 -07:00
Joe Malin 8cf99f0cce DOC CHANGE: Change GTV icons for home page
Change-Id: If7172345173b165350417ab52f706d6444dc4d96
2011-07-06 13:37:00 -07:00
Mike Lockwood 5b65ee4974 post_process_props: Write mangled properties back to file instead of stdout
Change-Id: I78b642400c46019165f12d409a238344ca6e09dd
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-06-08 19:06:43 -07:00
Joe Onorato 9197a487b4 post process the system properties
Change-Id: Ib78fe238d90dd4523326e4fa088d9333edc9e299
2011-06-08 16:04:14 -07:00
Scott Main 131c79cbd0 am 9b6614d5: am e02449dc: am 44c32b95: Merge "docs: adjust sdk page to show/hide messages based on whether online or offline docs mutually dependent on Change-Id: Ie7490973001530098d5001d9ef5e4dbfab86ed08" into honeycomb-mr2
* commit '9b6614d58bf3ed4ad127bc607405af834c349662':
  docs: adjust sdk page to show/hide messages based on whether online or offline docs mutually dependent on Change-Id: Ie7490973001530098d5001d9ef5e4dbfab86ed08
2011-06-02 16:22:44 -07:00
Scott Main 9b6614d58b am e02449dc: am 44c32b95: Merge "docs: adjust sdk page to show/hide messages based on whether online or offline docs mutually dependent on Change-Id: Ie7490973001530098d5001d9ef5e4dbfab86ed08" into honeycomb-mr2
* commit 'e02449dc9f02459d077c99a72033c7653be634bb':
  docs: adjust sdk page to show/hide messages based on whether online or offline docs mutually dependent on Change-Id: Ie7490973001530098d5001d9ef5e4dbfab86ed08
2011-05-27 10:54:50 -07:00
Scott Main 17e47ad58f docs: adjust sdk page to show/hide messages based on whether online or offline docs
mutually dependent on Change-Id: Ie7490973001530098d5001d9ef5e4dbfab86ed08

Change-Id: I15658c0868c755947207cb8d6391b6aed4c90e14
2011-05-27 10:15:59 -07:00
Scott Main 00659251c3 am c9395fc3: am 8d29d2dc: am 9d27a153: am faf8baaf: docs: make featured video titles smaller so they don\'t line wrap
* commit 'c9395fc341fda71d95e622668545990fe94cdd5c':
  docs: make featured video titles smaller so they don't line wrap
2011-05-16 12:25:17 -07:00
Scott Main c9395fc341 am 8d29d2dc: am 9d27a153: am faf8baaf: docs: make featured video titles smaller so they don\'t line wrap
* commit '8d29d2dc670cc990fa6824fdd7ba25edb2a479f2':
  docs: make featured video titles smaller so they don't line wrap
2011-05-16 12:22:27 -07:00
Scott Main faf8baaff1 docs: make featured video titles smaller so they don't line wrap
Change-Id: I5f4dc06e467a30b579c2710ac1d96a350ef77ff2
2011-05-16 12:14:17 -07:00
Doug Zongker 02da210a5c pass blobs to write_raw_image() instead of using temp file
Change-Id: I73b71541596612552d52a8f7b1ccdd74451ac6fc
2011-04-12 15:50:17 -07:00
Scott Main 77aa8aff6d am 5d587a47: am 2218c027: am 63e2c1eb: docs: add Google IO 2011 logo
* commit '5d587a470f83afe07a9cb97ab0fdb555efee751d':
  docs: add Google IO 2011 logo
2011-04-01 16:27:17 -07:00
Scott Main 5d587a470f am 2218c027: am 63e2c1eb: docs: add Google IO 2011 logo
* commit '2218c027117b10fd909083c8c666bebb074c2167':
  docs: add Google IO 2011 logo
2011-04-01 16:25:04 -07:00
Scott Main 2218c02711 am 63e2c1eb: docs: add Google IO 2011 logo
* commit '63e2c1eba8079caa3288a14041239f7b5018ee92':
  docs: add Google IO 2011 logo
2011-04-01 16:19:26 -07:00
Scott Main 63e2c1eba8 docs: add Google IO 2011 logo
Change-Id: I0393325205c31f588d1e1fb64dfcc2d4714bdad6
2011-04-01 15:05:12 -07:00
Ying Wang cd4e323e0e am ce467097: am 54aa74ef: am a9e5bb8a: am f78fb1d1: Merge "Use my-dir in a consistent way as others"
* commit 'ce4670977d0367983e40ed339da793792fdb6e06':
  Use my-dir in a consistent way as others
2011-03-31 15:16:36 -07:00
Ying Wang ce4670977d am 54aa74ef: am a9e5bb8a: am f78fb1d1: Merge "Use my-dir in a consistent way as others"
* commit '54aa74ef5da0a76a0fc1afdabaa24d2fb0744cd1':
  Use my-dir in a consistent way as others
2011-03-31 15:14:32 -07:00
Ying Wang 54aa74ef5d am a9e5bb8a: am f78fb1d1: Merge "Use my-dir in a consistent way as others"
* commit 'a9e5bb8a6b2b772b07214e4dd0004f6989285dd0':
  Use my-dir in a consistent way as others
2011-03-31 15:11:58 -07:00
Ying Wang eb68729bf3 am 080ed92e: Merge "Close inherited PIPE before doing work" into gingerbread
* commit '080ed92e77fc7c24ca3bac1a1dc06057390bfdb8':
  Close inherited PIPE before doing work
2011-03-15 18:21:20 -07:00
Ying Wang 080ed92e77 Merge "Close inherited PIPE before doing work" into gingerbread 2011-03-15 17:49:05 -07:00
Iliyan Malchev b375e71d30 build: remove prelinker build build system
This patch removes support for prelinking from the build system.  By now, the
prelinker has outlived its usefulness for several reasons.  Firstly, the
speedup that it afforded in the early days of Android is now nullified by the
speed of hardware, as well as by the presence of Zygote.  Secondly, the space
savings that come with prelinking (measued at 17MB on a recent honeycomb
stingray build) are no longer important either.  Thirdly, prelinking reduces
the effectiveness of Address-Space-Layout Randomization.  Finally, since it is
not part of the gcc suite, the prelinker needs to be maintained separately.

The patch deletes apriori, soslim, lsd, isprelinked, and iself from the source
tree.  It also removes the prelink map.

LOCAL_PRELINK_MODULE becomes a no-op.  Individual Android.mk will get cleaned
separately.  Support for prelinking will have to be removed from the recovery
code and from the dynamic loader as well.

Change-Id: I5839c9c25f7772d5183eedfe20ab924f2a7cd411
2011-03-12 14:59:46 -08:00
Chih-Wei Huang e73c4bbc50 Use my-dir in a consistent way as others
Change-Id: I3fd0cc58b48d621b431d7dd05fb689c1917b530d
2011-03-11 11:48:48 +08:00
Ying Wang 70d6ec5f9b resolved conflicts for merge of 0a1f3236 to honeycomb-plus-aosp
Change-Id: I6596f4a65a99eed98bdca2d8a6840bc378297b6d
2011-03-07 11:07:12 -08:00
Scott Main 73b0979941 am e8f40264: Merge "docs: update android market icon" into honeycomb
* commit 'e8f402640b278b234594fd68dc5bab4ac94a334e':
  docs: update android market icon
2011-03-07 10:51:43 -08:00
Scott Main e8f402640b Merge "docs: update android market icon" into honeycomb 2011-03-07 10:44:54 -08:00
Scott Main 2e426cf07c am 3ab162e7: docs: script update to account for double-nested list items when scrolling sidenav into view
* commit '3ab162e71cbe88ec4d2207c39b9f3d2d7f4c965c':
  docs: script update to account for double-nested list items when scrolling sidenav into view
2011-03-05 09:24:41 -08:00
Ying Wang 0a1f3236e3 am a73b6561: Drop support for target files with no recovery.fstab.
* commit 'a73b6561cee39ad416f4af327dbe72ec565d2423':
  Drop support for target files with no recovery.fstab.
2011-03-04 17:13:04 -08:00
Ying Wang a73b6561ce Drop support for target files with no recovery.fstab.
Change-Id: I099298cfffc2546975732a3bf0df60f96ccbdac4
Meanwhile don't build the ota and update zip files if no recovery.fstab
found.
2011-03-04 14:42:13 -08:00
Scott Main 3ab162e71c docs: script update to account for double-nested list items when scrolling sidenav into view
Change-Id: I03668f9ecb7da03a7921a0d7eacd2dcaa0a1ba54
2011-03-04 12:24:54 -08:00
Scott Main a9c45d1311 am befeb8e5: docs: css tweaks to quickview subrule
* commit 'befeb8e5d54efe9511237e7f5cd99707e1717cb5':
  docs: css tweaks to quickview subrule
2011-03-04 11:17:24 -08:00
Scott Main 6da57060d1 docs: update android market icon
Change-Id: I3659cb6cbeb795debd769efc7245cd14d2a86418
2011-03-04 10:18:04 -08:00
Scott Main befeb8e5d5 docs: css tweaks to quickview subrule
Change-Id: Ib25255c176ed13e8d0bb5edc4172e1629a886125
2011-03-04 09:56:50 -08:00
Scott Main 6c4e37b153 am 75eb14bc: docs: add default margins for form element
* commit '75eb14bc1c2ae4f46c6d67ec51c1a9e8ed42e25f':
  docs: add default margins for form element
2011-03-04 01:21:45 -08:00
Scott Main 75eb14bc1c docs: add default margins for form element
Change-Id: Ibce828e2f22193e1725420e90d4df408646f23dd
2011-03-03 10:28:02 -08:00
Doug Zongker 369985c6f2 remove vestigial WriteFirmwareImage function
Nothing calls this, and the updater function it calls no longer
exists.  The HTC-device-specific thing it used to do was moved to HTC
extension libraries.

Change-Id: I2252adf44ea0c5beb6e9379215d7337880f66f68
2011-03-02 10:57:06 -08:00
Dirk Dougherty c3efc5abe1 am 94f31517: am c2fa0fde: Merge "Doc change: add image for GDC 2011 announcement." into honeycomb
* commit '94f3151763c68b6a5c503d3a49a2e01bd7fb7d6e':
  Doc change: add image for GDC 2011 announcement.
2011-02-27 22:35:37 -08:00
Dirk Dougherty 94f3151763 am c2fa0fde: Merge "Doc change: add image for GDC 2011 announcement." into honeycomb
* commit 'c2fa0fde6f4a9c44255e137fcb524979ce9bc587':
  Doc change: add image for GDC 2011 announcement.
2011-02-27 22:32:24 -08:00
Dirk Dougherty c2fa0fde6f Merge "Doc change: add image for GDC 2011 announcement." into honeycomb 2011-02-27 22:23:02 -08:00
Ying Wang 77f31fe728 Fix dump vars.
Now you have to run config.mk instead of envsetup.mk to dump vars in the build system.

Change-Id: I6caaa7eb13dfd55f07303963f6337d51fb126bb9
2011-02-25 11:12:13 -08:00
Doug Zongker cf58dafc17 am 9df922a0: read partition length from recovery.fstab
* commit '9df922a077a6bb45b742f5e2ac668a537999e604':
  read partition length from recovery.fstab
2011-02-24 18:42:04 -08:00
Doug Zongker 9df922a077 read partition length from recovery.fstab
Don't hardcode magical partition behavior in the script generator.

Change-Id: I4aeea022f8a32a7c9f316be2c2514510344ca0e0
2011-02-24 18:39:27 -08:00
Dirk Dougherty 003d921b4f Doc change: add image for GDC 2011 announcement.
Change-Id: Ia7bac143a043a1f9c74de3be04a566371ad6dbe6
2011-02-24 15:51:05 -08:00
Doug Zongker ca855e9c0a increase java heap size when signing packages
Large OTA packages are causing signapk to run out of memory.

Change-Id: I511b9b5fb2d303805006ca76458f44bf72faeff2
2011-02-23 09:25:01 -08:00
Doug Zongker 9c2b9db6b5 Merge "read partition length from recovery.fstab" 2011-02-23 09:07:35 -08:00
Doug Zongker 086cbb0acb read partition length from recovery.fstab
Don't hardcode magical partition behavior in the script generator.

Change-Id: I4aeea022f8a32a7c9f316be2c2514510344ca0e0
2011-02-23 09:04:33 -08:00
Scott Main b12c010dad am d5f90275: am 287987db: add style for \'new-child\' class, which hides the "new" tag when the parent list item is expanded (for use when the parent is advertising a new child doc)
* commit 'd5f902751b259b9281c3c87966d6238e262de000':
  add style for 'new-child' class, which hides the "new" tag when the parent list item is expanded (for use when the parent is advertising a new child doc)
2011-02-22 21:40:08 -08:00
Scott Main d5f902751b am 287987db: add style for \'new-child\' class, which hides the "new" tag when the parent list item is expanded (for use when the parent is advertising a new child doc)
* commit '287987db4f47a770f9e48375c02fdb3369190f14':
  add style for 'new-child' class, which hides the "new" tag when the parent list item is expanded (for use when the parent is advertising a new child doc)
2011-02-22 21:13:03 -08:00
Scott Main 287987db4f add style for 'new-child' class, which hides the "new" tag when the parent
list item is expanded (for use when the parent is advertising a new child doc)

Change-Id: I81945c109d1edc3b588a8b1c5968179266a1dc48
2011-02-22 08:32:40 -08:00
Jeff Brown f24495f7da Remove obsolete kcm tool.
Change-Id: Ib5aa60cd9d308ce7c672c57513bdcf78e0f1080d
2011-02-19 05:22:55 -08:00
Scott Main 7f7b70619d am 826d0321: am c438082f: docs: add sampleindex file for droiddoc to customize the breadcrumbs
* commit '826d03213faa02820f7fcff0b397a8cfbf00b547':
  docs: add sampleindex file for droiddoc to customize the breadcrumbs
2011-02-16 12:02:59 -08:00
Scott Main 826d03213f am c438082f: docs: add sampleindex file for droiddoc to customize the breadcrumbs
* commit 'c438082fd2dde771f0b3f1628777a3e2bd12214f':
  docs: add sampleindex file for droiddoc to customize the breadcrumbs
2011-02-16 12:00:21 -08:00
Scott Main c438082fd2 docs: add sampleindex file for droiddoc to customize the breadcrumbs
Change-Id: If777ebb3cfe4887ec8ce8f746b9ec83b82035b37
2011-02-16 10:05:29 -08:00
Scott Main 386ce961e9 am 2781cae5: am 1000e35a: docs: add honeycomb logo and revise css to for toggle widget
* commit '2781cae512e1abeab43e4e8decd50f2a5a46eb96':
  docs: add honeycomb logo and revise css to for toggle widget
2011-02-14 10:44:20 -08:00
Scott Main 2781cae512 am 1000e35a: docs: add honeycomb logo and revise css to for toggle widget
* commit '1000e35a6b5351cae8c8f5df23020bd870ccd062':
  docs: add honeycomb logo and revise css to for toggle widget
2011-02-14 10:42:35 -08:00
Scott Main 1000e35a6b docs: add honeycomb logo and revise css to for toggle widget
Change-Id: I497dfe417b0d3b496314571ad766f2dd78415954
2011-02-14 10:39:28 -08:00
Ying Wang 7e6d4e45d9 Close inherited PIPE before doing work
Gmake in Darwin has file descriptor leak.
In a full build, ota_from_target_files will inherits
more than 2000 open PIPEs from gmake and fails in a call to select.select().
This change fixes the build by closing the PIPEs before doing real work.

Change-Id: Ie7035d7add0b1da3afb6bf9c2009d40f8c7d29b3
2011-02-10 11:36:43 -08:00
Scott Main 706408ea9f am 1a35a101: am 4c8ae40a: docs: remove preliminary watermark from docs
* commit '1a35a101ada24a0fa5220dc695f458cf248c814f':
  docs: remove preliminary watermark from docs
2011-02-07 15:37:00 -08:00
Scott Main 1a35a101ad am 4c8ae40a: docs: remove preliminary watermark from docs
* commit '4c8ae40abba83921bd98eb6636b5e3d753bbd183':
  docs: remove preliminary watermark from docs
2011-02-07 15:34:50 -08:00
Scott Main 4c8ae40abb docs: remove preliminary watermark from docs
Change-Id: I452596cdc5b87effdb958ff963d9aa80ebec5d37
2011-02-07 14:26:45 -08:00
Scott Main 3fbd3207f2 am 053f5491: am 4b311bc9: Merge "fix api level filtering script to compare integers, not strings" into honeycomb
* commit '053f5491340f5bacddd9943521c8f1b1d0c0bb6a':
  fix api level filtering script to compare integers, not strings
2011-02-07 13:47:05 -08:00
Scott Main 6f963b3930 am c52832ad: am 8cf6d9e3: Merge "tweak header css for more distinction" into honeycomb
* commit 'c52832ad5c5ac994f6e49de14c6e9f43da997d32':
  tweak header css for more distinction
2011-02-07 13:45:10 -08:00
Scott Main 053f549134 am 4b311bc9: Merge "fix api level filtering script to compare integers, not strings" into honeycomb
* commit '4b311bc91a7851b204c63e678b0213504125d3aa':
  fix api level filtering script to compare integers, not strings
2011-02-04 15:17:04 -08:00
Scott Main 612816385a am 886e5aa7: Merge "fix api level filtering script to compare integers, not strings" into gingerbread
* commit '886e5aa742c1667de3ca5b628bf6865948ef4513':
  fix api level filtering script to compare integers, not strings
2011-02-04 15:14:57 -08:00
Scott Main 11057f5a0a fix api level filtering script to compare integers, not strings
Change-Id: I8f0e44ec2bf0833a0d547a3795ee31ee0dc69d8a
2011-02-04 15:13:04 -08:00
Scott Main af2ba51ed5 fix api level filtering script to compare integers, not strings
Change-Id: I4d0d6c40dd5c1f8470567ef30f0f7500b442fbe5
2011-02-04 15:10:33 -08:00
Scott Main c52832ad5c am 8cf6d9e3: Merge "tweak header css for more distinction" into honeycomb
* commit '8cf6d9e3ae1f7a18c49121c578fe1f5f05371342':
  tweak header css for more distinction
2011-02-04 11:48:59 -08:00
Scott Main a16d7d8ad3 tweak header css for more distinction
Change-Id: I1d63b7587917bfde3df5547b5648610d86083d6a
2011-02-03 19:30:48 -08:00
Scott Main 463694a4f5 am 0fe9974c: cherrypick Change-Id: Ib8a7ae66f0dc6db6a2c8f2a79238d95e67c627f3 backport some style changes for notes from master to gb
* commit '0fe9974c38e41a2aa386d5744d1a75d8bd26b1bc':
  cherrypick Change-Id: Ib8a7ae66f0dc6db6a2c8f2a79238d95e67c627f3 backport some style changes for notes from master to gb
2011-02-01 20:52:23 -08:00
Scott Main 0fe9974c38 cherrypick Change-Id: Ib8a7ae66f0dc6db6a2c8f2a79238d95e67c627f3
backport some style changes for notes from master to gb

Change-Id: I4a7c6cfcadade5d90069ecab1edc694cb333430e
2011-02-01 20:37:20 -08:00
Doug Zongker e121d6acf4 support TARGET_EXTRA_RECOVERY_KEYS
Specifying one or more key files (without .x509.pem extension) as
TARGET_EXTRA_RECOVERY_KEYS causes them to be included as acceptable
keys for recovery packages.  They are *not* included in otacerts.zip,
so actual downloaded over-the-air packages can't use them, but they
can be used to sign sideload-only packages.

Bug: 3413359
Change-Id: I6f248ffa35f0c6b125dd8a7517493017e236c776
2011-02-01 14:13:52 -08:00
Scott Main 91aea02de8 am f1813105: am e104f773: Merge "docs: modify style for toggle stuff so text isn\'t blue" into honeycomb
* commit 'f1813105701aba194464e1f6206330c4ffff25fd':
  docs: modify style for toggle stuff so text isn't blue
2011-02-01 10:07:30 -08:00
Scott Main f181310570 am e104f773: Merge "docs: modify style for toggle stuff so text isn\'t blue" into honeycomb
* commit 'e104f7731807c28d6c23eef7b88e1f53e1f7484a':
  docs: modify style for toggle stuff so text isn't blue
2011-01-31 18:52:09 -08:00
Scott Main e104f77318 Merge "docs: modify style for toggle stuff so text isn't blue" into honeycomb 2011-01-31 17:51:13 -08:00
Scott Main 219687b25c docs: modify style for toggle stuff so text isn't blue
Change-Id: Ief363bf67d4e0c0fc1a8e79d4b02474c475c88ac
2011-01-31 17:24:07 -08:00
The Android Open Source Project 3b6bf4484e Mass merge from gingerbread - do not merge
Change-Id: Idbfeda9c0a9720d894352747c01754ed2c90c44d
2011-01-30 12:39:46 -08:00
Jean-Baptiste Queru 6e47f1cd0c Merge 66888a7c from gingerbread
Change-Id: Ieba42e9ecfaf6078d2c8442560119863a329fa06
2011-01-29 09:24:41 -08:00
Doug Zongker 4f471d48b1 am 79cad63f: am b54972c9: Merge "fix check_target_files_signatures" into honeycomb
* commit '79cad63f61874f2d6f3fc4f931cd79c2a5f2a9a9':
  fix check_target_files_signatures
2011-01-27 10:36:27 -08:00
Doug Zongker 6ae5381670 fix check_target_files_signatures
common.UnzipTemp now returns a 2-tuple instead of just a string.

Bug: 3398407
Change-Id: Ifd0408283aaa15752caa549f4510a0a3db03c3fd
2011-01-27 10:20:27 -08:00
Doug Zongker 74c1872875 am bc06b17c: am 55d93284: support use of prebuilt bootable images
* commit 'bc06b17c82ecfdec70314d45282207a41ea3ee5f':
  support use of prebuilt bootable images
2011-01-26 09:56:30 -08:00
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
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
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 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
Michael Chan b43ac8fc2f Fix build break
Change-Id: Ie07f042a9f25bf3329cf2cea8fdeea3e208da775
2011-01-19 21:12:41 -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
Scott Main 58286dcd1f fix build
Change-Id: If4adf6b91b932f44c5456bd76fed968e9d84c556
2011-01-17 18:23:21 -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
Scott Main 7bc0fb1b32 docs: revise preview statement and links
Change-Id: I9c0bde91c2c87c661fe877608a48a5bd577860f3
2011-01-17 16:16:12 -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
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 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
Dirk Dougherty 78064b4c69 Doc change: Remove redundant dir and image.
Change-Id: I6867250f48b71d857b1cf80f28392ec9879005c7
2011-01-07 17:07:43 -08:00
Scott Main fd85d42e83 docs: catchup templates to non-merged changes from gingerbread,
from Change-Id: I4555c496088dd8aac77f9aa01273c3a1d52f89e0, plus
the gingerbread logo

Change-Id: I3864480b9f68679c64747888a6919314f8ac6cbf
2011-01-07 12:40:42 -08:00
Jean-Baptiste Queru 54c5e5b18b am 1b8c01db: Merge "Product-configurable sparse ext images."
* commit '1b8c01dbee93366e31b67529a26e1a7b6198c876':
  Product-configurable sparse ext images.
2010-12-28 13:51:53 -08:00
Ying Wang 085a14698b Product-configurable sparse ext images.
Also pass extfs sparse image flag to the release tool.

Change-Id: I79a6a71873634a231aa8990cee22374259601505
2010-12-28 13:41:33 -08:00
Ying Wang f9bbfb5772 Close inherited PIPE before doing work
Gmake in Darwin has file descriptor leak.
In a full build, ota_from_target_files will inherits
more than 2000 open PIPEs from gmake and fails in a call to select.select().
This change fixes the build by closing the PIPEs before doing real work.

Change-Id: Ife021382198642a97bbbf0b623e4f24f3d86b2b2
2010-12-13 16:25:36 -08:00
Scott Main 6ea057563d resolved conflicts for merge of 1c4fe5aa to master
Change-Id: I3c83852dfb6a80614aad145d12cd61b65829805f
2010-12-06 16:36:53 -08:00
Scott Main 1c4fe5aaff am dad569b4: docs: fix link
* commit 'dad569b4e815dee7056ff4d2e593ddadc3e087e1':
  docs: fix link
2010-12-05 19:04:18 -08:00
Scott Main dad569b4e8 docs: fix link
Change-Id: Id57ebbd12c16ef914ebe1d90260fdf8a5ae4587b
2010-12-05 18:03:23 -08:00
Scott Main b73777e56b docs: revisions to the sdk doc template for preview sdk,
remove ndk download table for offline docs

Change-Id: I13da1e5ab825f1d5c6a19ef9a76c36a3edd88bf6
2010-11-22 16:25:09 -08:00
Scott Main 63e9ccd1d6 docs: revise stylesheet to allow "notes" in divs, not just paragraphs
Change-Id: Ia78a82dd330a4f31076b74ce86237af3aca1ba2e
2010-11-18 13:54:40 -08:00
Ying Wang c5a07ce038 Pass extfs sparse image flag to the release tool.
Change-Id: Icb2a1c4fddb2b6153298ba1b849016aa3d792773
2010-11-17 17:45:36 -08:00
Scott Main 19c43fea22 docs: add preliminary watermark to docs
Change-Id: Ifc9ea60b53d3e5e52b9cd52174a6d8f0982fe523
2010-11-16 16:24:42 -08:00
Joe Onorato 25939e224e Set ro.build.characteristics to the value from PRODUCT_CHARACTERISTICS that's also passed to aapt.
Bug: 3144768
Change-Id: Ic1724c64d015de7a5c4f13709b91db51b8f10872
2010-11-09 08:53:01 -08:00
Scott Main 9d1d63e2a7 am 1be24531: am badffa84: docs: revise intro to reflect changes to quick start
* commit '1be245314ddc88e5bde92e9a0660b1fbbd63422f':
  docs: revise intro to reflect changes to quick start
2010-11-08 19:25:01 -08:00
Scott Main 1be245314d am badffa84: docs: revise intro to reflect changes to quick start
* commit 'badffa84327de8154ea3ba96dcf908478c4d4a17':
  docs: revise intro to reflect changes to quick start
2010-11-08 17:10:25 -08:00
Scott Main badffa8432 docs: revise intro to reflect changes to quick start
Change-Id: I0fdc13344831960d3fb82f80d5e391186117fc5c
2010-11-08 16:10:18 -08:00
Scott Main 00c837da0a am 9f7e7946: am c775c754: docs: add gingerbread logo for homepage
* commit '9f7e7946959fa776731283cbef97646b6d9d3013':
  docs: add gingerbread logo for homepage
2010-11-06 16:25:09 -07:00
Scott Main d5c09153a7 am 56c69603: am ec97fd30: docs: revisions to ndk download intro
* commit '56c69603adb97e6f0a81874f16d81f538259cd55':
  docs: revisions to ndk download intro
2010-11-06 16:24:08 -07:00
Dirk Dougherty 8ad27435f5 Doc change: Merge commit '9561b575' into master
Conflicts:
	tools/droiddoc/templates-sdk/sdkpage.cs

Change-Id: Ibc2edc2550fe93b3c8f2c7e041fae81136fdb1c2
2010-11-06 16:18:20 -07:00
Scott Main 9f7e794695 am c775c754: docs: add gingerbread logo for homepage
* commit 'c775c754f13bd54b7d5da8c28186cdd8167dc53a':
  docs: add gingerbread logo for homepage
2010-11-06 14:21:16 -07:00
Scott Main c775c754f1 docs: add gingerbread logo for homepage
Change-Id: I54db7009931e1ec5688d4f473a520a4f61db598a
2010-11-05 14:29:07 -07:00
Scott Main 56c69603ad am ec97fd30: docs: revisions to ndk download intro
* commit 'ec97fd30a6af6d954f156620a69c29352e012d39':
  docs: revisions to ndk download intro
2010-11-05 13:57:15 -07:00
Robert Ly 9561b57543 am 706e41e5: Update the template text for the NDK download page to point to new links
* commit '706e41e55f2e3b456c51b56ba07d1dfd56716af9':
  Update the template text for the NDK download page to point to new links
2010-11-05 13:57:10 -07:00
Scott Main ec97fd30a6 docs: revisions to ndk download intro
Change-Id: Ib1ba3d5f0e727a1246dc92161b72bcfff6f9d772
2010-11-04 21:02:14 -07:00
Robert Ly 706e41e55f Update the template text for the NDK download page to point to new
links

Change-Id: Icb1571eae18dcd9f9f86c5fd855f15783f9d4ae4
2010-11-04 13:36:37 -07:00
Scott Main 987fb055d1 am 2e94aa25: docs: make the resizable side nav standard. DO NOT MERGE. This actually affects only the SDK tab, which previously did not allow resizing---now it does. Also add a couple new templates to allow either 190 or 200 pixel-wide side navigation by default, and
* commit '2e94aa25d458e96d6503b88c52e81c65fb34a9d0':
  docs: make the resizable side nav standard. DO NOT MERGE. This actually affects only the SDK tab, which previously did not allow resizing---now it does. Also add a couple new templates to allow either 190 or 200 pixel-wide side navigation by default, and apply 200 to the Resources tab.
2010-11-01 20:21:39 -07:00
Scott Main 2e94aa25d4 docs: make the resizable side nav standard. DO NOT MERGE.
This actually affects only
the SDK tab, which previously did not allow resizing---now it does.
Also add a couple new templates to allow either 190 or 200 pixel-wide
side navigation by default, and apply 200 to the Resources tab.

Change-Id: I4555c496088dd8aac77f9aa01273c3a1d52f89e0
2010-11-01 15:53:06 -07:00
Scott Main e9e311a47b am fa83b5e4: Merge "docs: update sdk download template DO NOT MERGE add windows installer and revise a bit else" into gingerbread
* commit 'fa83b5e4daf43a431463e80c56fe115a6db3ca04':
  docs: update sdk download template DO NOT MERGE add windows installer and revise a bit else
2010-11-01 10:53:08 -07:00
Scott Main f086a6e434 docs: update sdk download template DO NOT MERGE
add windows installer and revise a bit else

Change-Id: Ie0ea7765d797cb54ee1d7fc733ec6db4fdedac3a
2010-10-28 00:21:25 -07:00
Scott Main 6084cc948c am 9d32bd5b: docs: css tweak to Ps in sidebox. DO NOT MERGE.
Merge commit '9d32bd5b03c92e9220ff6cca029a587f5f3c754c' into gingerbread-plus-aosp

* commit '9d32bd5b03c92e9220ff6cca029a587f5f3c754c':
  docs: css tweak to Ps in sidebox. DO NOT MERGE.
2010-10-25 17:22:50 -07:00
Scott Main 9d32bd5b03 docs: css tweak to Ps in sidebox. DO NOT MERGE.
Change-Id: Ifa3e4a9a2c2ba67b6da615ebc336c897dd9caeda
2010-10-25 17:15:12 -07:00
Scott Main 672066778b am c0aa1e1b: Merge "remove whitespace from end of package descriptions, which added new lines when the summary includes a paragraph. Do not merge." into gingerbread
Merge commit 'c0aa1e1b305d85baef1dcedabbea1d084f3ed54a' into gingerbread-plus-aosp

* commit 'c0aa1e1b305d85baef1dcedabbea1d084f3ed54a':
  remove whitespace from end of package descriptions, which added new lines when the summary includes a paragraph. Do not merge.
2010-10-15 18:22:09 -07:00
Scott Main 5466af5017 remove whitespace from end of package descriptions, which added new lines when the summary includes a paragraph. Do not merge.
Change-Id: Ic8a7bec4f9a0aa81b8ab18d340281ad0d7e7c053
2010-10-15 11:18:58 -07:00
Ying Wang 421b46e0cb resolved conflicts for merge of 18c00c5c to master
Change-Id: I7f6870b654e24a268a14b9c47eb8d384993273f2
2010-09-28 10:45:54 -07:00
Ying Wang 18c00c5c6a am bb2b82bd: Merge "Fix userdata partition\'s ext4 mount point to data." into gingerbread
Merge commit 'bb2b82bd557b157fea5e280ef50ee782d15ac032' into gingerbread-plus-aosp

* commit 'bb2b82bd557b157fea5e280ef50ee782d15ac032':
  Fix userdata partition's ext4 mount point to data.
2010-09-27 18:05:22 -07:00
Ying Wang 026f1451ce Fix userdata partition's ext4 mount point to data.
Bug: 3041475
Change-Id: I07306cd9c90072626dfc132d6655618ae70e64be
2010-09-27 17:49:03 -07:00
Doug Zongker e1c292a06b am 8317e664: am 96a57e73: make info_dict and GetTypeAndDevice available to device extensions
Merge commit '8317e66433903badaec8ebd2b9ec2b8153f3d612'

* commit '8317e66433903badaec8ebd2b9ec2b8153f3d612':
  make info_dict and GetTypeAndDevice available to device extensions
2010-09-26 15:17:44 -07:00
Doug Zongker 8317e66433 am 96a57e73: make info_dict and GetTypeAndDevice available to device extensions
Merge commit '96a57e737707d05333dced5b657c4ef21c44088a' into gingerbread-plus-aosp

* commit '96a57e737707d05333dced5b657c4ef21c44088a':
  make info_dict and GetTypeAndDevice available to device extensions
2010-09-26 15:09:54 -07:00
Doug Zongker 96a57e7377 make info_dict and GetTypeAndDevice available to device extensions
Change-Id: I3aa04cb6d7988fc1fdd7f179634b09ceab5749fb
2010-09-26 14:57:41 -07:00
Ying Wang e5870f76ea am b6579c68: am 1448b0b7: Remove emulator-based dexpreopt code
Merge commit 'b6579c68a75c34bd1054e31182ee98406185b1e8'

* commit 'b6579c68a75c34bd1054e31182ee98406185b1e8':
  Remove emulator-based dexpreopt code
2010-09-26 14:16:20 -07:00
Ying Wang b6579c68a7 am 1448b0b7: Remove emulator-based dexpreopt code
Merge commit '1448b0b7023a43ff4461cc66d25230c9b6502724' into gingerbread-plus-aosp

* commit '1448b0b7023a43ff4461cc66d25230c9b6502724':
  Remove emulator-based dexpreopt code
2010-09-26 13:47:45 -07:00
Ying Wang 1448b0b702 Remove emulator-based dexpreopt code
Now dexpreopt is done on the host side.

Change-Id: I1ea1a5d1fac2531028e017364ef870abb7420be7
2010-09-26 13:11:16 -07:00
Ficus Kirkpatrick 62185bbd6c am 954a5e60: am e7f8140e: am 7978d50e: Add a workaround for a platform JAR parsing bug.
Merge commit '954a5e606ba6af5aef514c2c4c0d3ea2554b48f9'

* commit '954a5e606ba6af5aef514c2c4c0d3ea2554b48f9':
  Add a workaround for a platform JAR parsing bug.
2010-09-24 11:26:29 -07:00
Ficus Kirkpatrick 954a5e606b am e7f8140e: am 7978d50e: Add a workaround for a platform JAR parsing bug.
Merge commit 'e7f8140e6df19840a6f2c4bc7063cc6c484b140f' into gingerbread-plus-aosp

* commit 'e7f8140e6df19840a6f2c4bc7063cc6c484b140f':
  Add a workaround for a platform JAR parsing bug.
2010-09-24 11:09:40 -07:00
Ficus Kirkpatrick e7f8140e6d am 7978d50e: Add a workaround for a platform JAR parsing bug.
Merge commit '7978d50edb9c4da0b8f4076412f092418da6e372' into gingerbread

* commit '7978d50edb9c4da0b8f4076412f092418da6e372':
  Add a workaround for a platform JAR parsing bug.
2010-09-24 10:58:04 -07:00
Ficus Kirkpatrick 7978d50edb Add a workaround for a platform JAR parsing bug.
The java.util.jar implementation through Android 1.6 has a
bug where if the signature file in META-INF is a multiple
of 1024 bytes, it will throw an IOException attempting to
read it.

If signapk would produce a CERT.SF in a multiple of 1024
bytes, add an extra CRLF to the end of the file.

Bug: 3019677
Change-Id: I23d4a36e12e224be600d3ac39379b5b5a022a628
2010-09-24 10:24:53 -07:00
Doug Zongker 7fa4a21e18 am 780c2372: accommodate both new and old target-files when creating incrementals (do not merge)
Merge commit '780c2372706c5250079cb7d759f6530691dd9143' into gingerbread-plus-aosp

* commit '780c2372706c5250079cb7d759f6530691dd9143':
  accommodate both new and old target-files when creating incrementals (do not merge)
2010-09-22 10:18:33 -07:00
Doug Zongker f2ab290550 accommodate both new and old target-files when creating incrementals
(cherry-picked from gingerbread.)

Change-Id: I925bf122b0012302a85c0b6f04cca48eb694b0c4
2010-09-22 10:17:31 -07:00
Doug Zongker 780c237270 accommodate both new and old target-files when creating incrementals (do not merge)
Change-Id: Ibc211164bf1dee8275e15d10cbe81b63d666069f
2010-09-22 10:12:54 -07:00
Doug Zongker 539db3b845 resolved conflicts for merge of e1daf61d to master
Change-Id: Idf5767f68dd19b51940ea69528cdd389b04d56b9
2010-09-21 20:10:32 -07:00
Doug Zongker e1daf61d43 am ad806982: arg: system_size, not system_img
Merge commit 'ad806982c12b64d8dff040f5c9a444d810d7694c' into gingerbread-plus-aosp

* commit 'ad806982c12b64d8dff040f5c9a444d810d7694c':
  arg: system_size, not system_img
2010-09-21 17:25:59 -07:00
Doug Zongker ad806982c1 arg: system_size, not system_img
Change-Id: Iba5d10204c93159a4f12ea8e8d8687db5b9dd5ca
2010-09-21 17:22:14 -07:00
Doug Zongker 33a4b08b15 fall back to MTD if no recovery.fstab is present
Needed for non-device builds (like for the emulator) to work.

Change-Id: I5fdbfb3af34821811744e8ce5bf1eff8df344c73
2010-09-21 16:12:55 -07:00
Doug Zongker 714633b13f am c0434ac8: add recovery.fstab as dependency so it triggers rebuild (do not merge)
Merge commit 'c0434ac8b504df8a2f2a2828dc9b3f804c3dda72' into gingerbread-plus-aosp

* commit 'c0434ac8b504df8a2f2a2828dc9b3f804c3dda72':
  add recovery.fstab as dependency so it triggers rebuild (do not merge)
2010-09-21 14:37:19 -07:00
Doug Zongker c0434ac8b5 add recovery.fstab as dependency so it triggers rebuild (do not merge)
Make recovery image depend on the fstab file so it gets rebuilt when
fstab changes.  Add support for "emmc" fstab partition type to
edify_generator.

Change-Id: Ic5df4e86c24321bf7d82a644e3e4770352e4f64b
2010-09-21 14:26:36 -07:00
Doug Zongker 9ce0fb6e59 support for per-partition fs_type
Include the recovery.fstab file in the recovery image.  Remove the
global fs_type and partition_type values from the target-files
key/value dict, and parse the recovery.fstab file instead to find
types for each partition.

(Cherrypicked from gingerbread w/some edits to resolve conflicts.)

Change-Id: Ic3ed85ac5672d8fe20280dacf43d5b82053311bb
2010-09-21 14:13:11 -07:00
Doug Zongker ed2d3f42d1 am 258bf46e: support for per-partition fs_type (do not merge)
Merge commit '258bf46ea6bb4f25d01fab1b783238589e5bbec4' into gingerbread-plus-aosp

* commit '258bf46ea6bb4f25d01fab1b783238589e5bbec4':
  support for per-partition fs_type (do not merge)
2010-09-21 11:37:10 -07:00
Doug Zongker 258bf46ea6 support for per-partition fs_type (do not merge)
Include the recovery.fstab file in the recovery image.  Remove the
global fs_type and partition_type values from the target-files
key/value dict, and parse the recovery.fstab file instead to find
types for each partition.

Change-Id: I35ee2dd0989441dc2a704b63c1b32e598049acb5
2010-09-21 09:55:29 -07:00
Doug Zongker cb269124bb am 25df2a98: am 6be030af: Merge "remove remaining refs to max_image_sizes" into gingerbread
Merge commit '25df2a980d87f011fe702b6209c3b71b2824fc18'

* commit '25df2a980d87f011fe702b6209c3b71b2824fc18':
  remove remaining refs to max_image_sizes
2010-09-17 08:24:37 -07:00
Doug Zongker 25df2a980d am 6be030af: Merge "remove remaining refs to max_image_sizes" into gingerbread
Merge commit '6be030af2907cfbbfe59bd207e07f09c45ec4588' into gingerbread-plus-aosp

* commit '6be030af2907cfbbfe59bd207e07f09c45ec4588':
  remove remaining refs to max_image_sizes
2010-09-17 07:48:28 -07:00
Doug Zongker 1684d9c0cf remove remaining refs to max_image_sizes
Change-Id: I7e4686bc06f9c3eab2df34d092021c549738b217
2010-09-17 07:45:30 -07:00
Doug Zongker b984ae51e5 resolved conflicts for merge of 813ad17a to master
Change-Id: I3fc84babbbcab712c5e38a0c8b815115ba89375f
2010-09-16 23:13:11 -07:00
Doug Zongker 813ad17ad3 am 918ccff3: Merge "consolidate target_files metadata into one key-value file" into gingerbread
Merge commit '918ccff37260270d0eef3a3a7bfc2410c46d931a' into gingerbread-plus-aosp

* commit '918ccff37260270d0eef3a3a7bfc2410c46d931a':
  consolidate target_files metadata into one key-value file
2010-09-16 18:11:59 -07:00
Doug Zongker 37974731fc consolidate target_files metadata into one key-value file
Instead of separate files for recovery api version, tool extensions,
and mkyaffs2 options, put those all in the generic key-value file.

Change-Id: Ib642311632844d52e4895fd4747093fc7e86232d
2010-09-16 17:44:38 -07:00
Doug Zongker 486de126e3 only do size check for yaffs images; fix incremental info dict
Change-Id: Ic862000a23b93289604b0737bfcaf8d461f36ff8
2010-09-16 14:01:56 -07:00
Doug Zongker 9b3944ed8c am 4d197be3: am ec5ffbab: allow partition sizes in hex (when prefixed with 0x)
Merge commit '4d197be33970a163e8e38ba1b685718784498e43'

* commit '4d197be33970a163e8e38ba1b685718784498e43':
  allow partition sizes in hex (when prefixed with 0x)
2010-09-16 13:08:25 -07:00
Doug Zongker 4d197be339 am ec5ffbab: allow partition sizes in hex (when prefixed with 0x)
Merge commit 'ec5ffbabd3a3ba65bac934305f7ffcb7e15fb744' into gingerbread-plus-aosp

* commit 'ec5ffbabd3a3ba65bac934305f7ffcb7e15fb744':
  allow partition sizes in hex (when prefixed with 0x)
2010-09-16 13:04:07 -07:00
Doug Zongker ec5ffbabd3 allow partition sizes in hex (when prefixed with 0x)
Change-Id: I806879fd496304c449ff5315b0ef48fd766d6428
2010-09-16 13:01:26 -07:00
Doug Zongker f127eb709b resolved conflicts for merge of 2cb8d5eb to master
Change-Id: I3b1aec1aee7c6bfcee2e978b4755b2bae9e480c4
2010-09-16 12:38:40 -07:00
Doug Zongker 2cb8d5ebb2 am c77a9ad4: store user-visible image sizes in target-files
Merge commit 'c77a9ad444d49e2ad777678cf5671f0a94f44ffb' into gingerbread-plus-aosp

* commit 'c77a9ad444d49e2ad777678cf5671f0a94f44ffb':
  store user-visible image sizes in target-files
2010-09-16 12:32:56 -07:00
Doug Zongker c77a9ad444 store user-visible image sizes in target-files
Do the yaffs-specific adjustments to image sizes in common.CheckSize,
instead of baking it into the image size stored in the target-files
package.  Remove the special fs_type flag and fold it into the
"info_dict" we have for saving key-value pairs from the build system.

Change-Id: I6e63f3330f6277d9a946b22e66cadeb51203ba14
2010-09-16 12:29:17 -07:00
Doug Zongker df69250b75 am 8e8ff4ca: Merge "support for ext4/EMMC in target_files and OTA generation" into gingerbread
Merge commit '8e8ff4cad905a5b4eed7659152f075f9a5c038b1' into gingerbread-plus-aosp

* commit '8e8ff4cad905a5b4eed7659152f075f9a5c038b1':
  support for ext4/EMMC in target_files and OTA generation
2010-09-16 11:39:49 -07:00
Doug Zongker 8e8ff4cad9 Merge "support for ext4/EMMC in target_files and OTA generation" into gingerbread 2010-09-16 11:38:06 -07:00
Doug Zongker c19a8d5590 support for ext4/EMMC in target_files and OTA generation
Move the image sizes into a more generic key-value file.  Make them
optional.  Add additional key/value pairs describing what kind of
filesystem the device uses.  Pass new fs-type-related arguments in
edify scripts when mounting and reformatting partitions.

Don't include all the init.*.rc files from the regular system in
recovery -- they aren't needed, and break recovery on some devices.

Change-Id: Ic1c651f754ed00ba1cffe8cf56c43f7f3b0ebfd7
2010-09-16 11:34:31 -07:00
Joe Onorato 61f23925d2 am 6022a978: Merge "DO NOT MERGE - These errors were missing from the list, which made it impossible to turn them off." into gingerbread
Merge commit '6022a9786f745dc41f92e71e16b5b95a7cfd81b7' into gingerbread-plus-aosp

* commit '6022a9786f745dc41f92e71e16b5b95a7cfd81b7':
  DO NOT MERGE - These errors were missing from the list, which made it impossible to turn them off.
2010-09-16 11:22:22 -07:00
Joe Onorato c0bad69b82 DO NOT MERGE - These errors were missing from the list, which made it impossible to turn them off.
Change-Id: I94652bad7084f3868049b4ea0e43bb90f86dba6f
2010-09-16 14:16:51 -04:00
Joe Onorato 2818a2e555 am 27ce8811: DO NOT MERGE - Remove extra printf
Merge commit '27ce8811835e9bbc9e230a618e883d30d0101c9e' into gingerbread-plus-aosp

* commit '27ce8811835e9bbc9e230a618e883d30d0101c9e':
  DO NOT MERGE - Remove extra printf
2010-09-16 09:36:47 -07:00
Joe Onorato 27ce881183 DO NOT MERGE - Remove extra printf
Change-Id: I8a2e4fac78010fe531b080d3555557e557c038b9
2010-09-16 12:34:07 -04:00
Joe Onorato ca378ad412 am 25ab3dcc: Merge "DO NOT MERGE - Add a -knowntags option to droiddoc" into gingerbread
Merge commit '25ab3dcce40bc2d19eeb99c7b36eeab52e4fa582' into gingerbread-plus-aosp

* commit '25ab3dcce40bc2d19eeb99c7b36eeab52e4fa582':
  DO NOT MERGE - Add a -knowntags option to droiddoc
2010-09-16 09:27:31 -07:00
Joe Onorato 63170ff95d DO NOT MERGE - Add a -knowntags option to droiddoc
This lets us remove the special cases in Comment.java and specify additional
tags to not warn about for the big docs build.

Change-Id: I25ad651616f162919c56daa2d4bdf6333c9dd87d
2010-09-16 11:57:42 -04:00
Doug Zongker d3b5916be6 resolved conflicts for merge of 8ae62ec7 to master
Change-Id: Ieb424d1a8467ca13dae43190387e1137c1e396c9
2010-09-13 14:37:20 -07:00
Doug Zongker 8ae62ec722 am ea5d7a9d: move File and Difference classes into common script
Merge commit 'ea5d7a9de7660bef5b9c68f6372a92d4b2f2f1f6' into gingerbread-plus-aosp

* commit 'ea5d7a9de7660bef5b9c68f6372a92d4b2f2f1f6':
  move File and Difference classes into common script
2010-09-13 11:51:09 -07:00
Doug Zongker ea5d7a9de7 move File and Difference classes into common script
This makes them accessible from device-specific extensions (so they
can be used to send radio images as binary patches, for instance).

Change-Id: I2f2174b93b4265abf9400f9e5a0982caca0771e9
2010-09-12 15:26:16 -07:00
Doug Zongker 5c3dc2ad44 am 9314823c: am 93d574f8: Merge "return to using subprocess for running commands" into gingerbread
Merge commit '9314823c06d4434bf18d589c2fdea490428becf8'

* commit '9314823c06d4434bf18d589c2fdea490428becf8':
  return to using subprocess for running commands
2010-09-03 14:35:49 -07:00
Doug Zongker 9314823c06 am 93d574f8: Merge "return to using subprocess for running commands" into gingerbread
Merge commit '93d574f8c57b85e1de9fea2c7e868ac8ea56e2b9' into gingerbread-plus-aosp

* commit '93d574f8c57b85e1de9fea2c7e868ac8ea56e2b9':
  return to using subprocess for running commands
2010-09-03 14:33:22 -07:00
Doug Zongker 93d574f8c5 Merge "return to using subprocess for running commands" into gingerbread 2010-09-03 14:31:03 -07:00
Doug Zongker 39a984550f return to using subprocess for running commands
Reverts Ic4f1c747 and fixes the problem by splitting the extra_flags
argument (it wasn't working before because it was getting one argument
"-c 4096 -s 128" instead of four arguments "-c", "4096", "-s", "128"
and mkyaffs2image apparently just ignores that bogus argument?)

Change-Id: Ib1e08d634aa68bfab0f7e09680d407f2cee0797d
2010-09-03 14:15:34 -07:00
Doug Zongker c60c1bafa0 resolved conflicts for merge of a4a50996 to master
Change-Id: I52c617ff43aaf9e86b8fb7a2e9c305127566971a
2010-09-03 13:22:38 -07:00
Doug Zongker a4a50996ac am c637db16: remove remaining amend support
Merge commit 'c637db16d83b2c248b1cf0122e2ba558ed95762c' into gingerbread-plus-aosp

* commit 'c637db16d83b2c248b1cf0122e2ba558ed95762c':
  remove remaining amend support
2010-09-03 12:39:15 -07:00
Doug Zongker c637db16d8 remove remaining amend support
Remove the remaining (unused and untested) support for generating
amend scripts.  This means that you won't be able to OTA directly from
cupcake to gingerbread.

Change-Id: Iaf5295db92a42b336960d05295f48b67cb729337
2010-09-03 11:58:31 -07:00
Joe Onorato 42ee0a2a48 am cd7c775e: fix the build still
Merge commit 'cd7c775ece6854765ae3208818e76d9d11724713' into gingerbread-plus-aosp

* commit 'cd7c775ece6854765ae3208818e76d9d11724713':
  fix the build still
2010-08-31 13:00:56 -07:00
Joe Onorato cd7c775ece fix the build still
Change-Id: I2bfbcdd4b463549f3f331ac7a1c7fa89aadef1a8
2010-08-31 12:56:49 -07:00
Joe Onorato 0f9a91c94f am 0ee89a72: DO NOT MERGE - Back port change from master that enforces correctness in the javadoc comments.
Merge commit '0ee89a72d50ff4bc5c7d2a285cd799d3a8b48efb' into gingerbread-plus-aosp

* commit '0ee89a72d50ff4bc5c7d2a285cd799d3a8b48efb':
  DO NOT MERGE - Back port change from master that enforces correctness in the javadoc comments.
2010-08-31 12:12:17 -07:00
Joe Onorato 0ee89a72d5 DO NOT MERGE - Back port change from master that enforces correctness in the javadoc comments.
Change-Id: I886448a3126b81c19342d920669e050eb5ef20eb
2010-08-31 12:00:44 -07:00
Dirk Dougherty d77248ac7e Remove droiddoc/templates dir in favor of templates-sdk, move Android-specific assets to templates-sdk, add copies to templates-pdk as workaround.
Change-Id: Iad7d0f1955e5731ee9cebb8828a45bf3c297417b
2010-08-31 10:13:25 -07:00
Ying Wang e238e5af4c am a9703989: am ae553143: Refactor a bit.
Merge commit 'a97039890e6a1999327cb3e9f2a28bf077a96e07'

* commit 'a97039890e6a1999327cb3e9f2a28bf077a96e07':
  Refactor a bit.
2010-08-27 15:52:03 -07:00
Iliyan Malchev ddaae7326e Merge "Turn on ASLR by default. The "-a" option now takes an argument (on/off)." 2010-08-27 15:04:39 -07:00
Ying Wang a4b6db9bf0 am cef82129: am aa6dbe21: Try to fix system.img in update zip file.
Merge commit 'cef82129e1b2a26f883c20521d79175747eac434'

* commit 'cef82129e1b2a26f883c20521d79175747eac434':
  Try to fix system.img in update zip file.
2010-08-27 12:14:58 -07:00
Hristo Bojinov 1ddbbfbbf3 Merge "Increase the Retouch buffer size from 550,000 to 600,000" 2010-08-27 09:32:21 -07:00
Steve Block e3425a0220 Increase the Retouch buffer size from 550,000 to 600,000
The WebKit merge to r66079 built with JSC JavaScript engine triggers the
overflow.

Change-Id: Ifcb92aa019cfb0e7a93d667e15a792554fc0f676
2010-08-27 13:18:46 +01:00
Ying Wang a97039890e am ae553143: Refactor a bit.
Merge commit 'ae5531434877478985186dd0fb7ffefa12a74e52' into gingerbread-plus-aosp

* commit 'ae5531434877478985186dd0fb7ffefa12a74e52':
  Refactor a bit.
2010-08-26 16:07:12 -07:00