Commit graph

3023 commits

Author SHA1 Message Date
leozwang
160603cfc2 am 5837f102: am 1753b4e9: resolved conflicts for 00fdede3 to lmp-mr1-ub-dev
* commit '5837f1025cf28935f3c6f3e0417dcfeac4d56688':
  Add an option to include a full bootloader in incremental OTA.
2015-09-15 01:17:03 +00:00
leozwang
5837f1025c am 1753b4e9: resolved conflicts for 00fdede3 to lmp-mr1-ub-dev
* commit '1753b4e9e444d9ce57f5ce481ed5e3317670ee31':
  Add an option to include a full bootloader in incremental OTA.
2015-09-15 01:07:05 +00:00
leozwang
1753b4e9e4 resolved conflicts for 00fdede3 to lmp-mr1-ub-dev
Change-Id: If4b79f7ed4d67cd8ed708a84703eac58b1e979ac
2015-09-14 16:39:23 -07:00
leozwang
00fdede320 am 46d5efcd: Add an option to include a full bootloader in incremental OTA.
* commit '46d5efcd0d451a48cc793931efef2b1ca982386d':
  Add an option to include a full bootloader in incremental OTA.
2015-09-14 21:27:04 +00:00
leozwang
46d5efcd0d Add an option to include a full bootloader in incremental OTA.
Bug: 23101469
Bug: 23999213

Change-Id: Id5ed748a5639663bb5df954f9375838fd9c295ca
2015-09-14 10:41:34 -07:00
Tao Bao
e35d00d019 am 265d9aeb: releasetools: Update the fingerprint when signing.
* commit '265d9aeb622c5829787b16b903f028cacaa99c18':
  releasetools: Update the fingerprint when signing.
2015-09-12 23:00:24 +00:00
Tao Bao
265d9aeb62 releasetools: Update the fingerprint when signing.
ro.bootimage.build.fingerprint should be updated when signing.

Bug: 22720426
Bug: 24009888
Change-Id: I5bd31858c6bc31edcecc6f5248f4274481506288
2015-09-11 16:47:28 -07:00
Tao Bao
28f6f9c3de releasetools: Always write the last block if it's padded.
In BBOTAs if the last block of a DataImage is padded, we should always
write the whole block even for incremental OTAs. Because otherwise the
last block may be skipped if unchanged, but would fail the post-install
verification if it has non-zero contents in the padding bytes.

Bug: 23828506
Change-Id: I6f6789eec568ed0b808b9e425f5ecdbea1bdf446
(cherry picked from commit 7589e961a7)
2015-09-08 10:55:32 -07:00
Tao Bao
a6e6afbce6 am 39c322ce: releasetools: Fix the bug in symlink deletion.
* commit '39c322cefcc0ecba76a2ffb8881694fd010a87fc':
  releasetools: Fix the bug in symlink deletion.
2015-09-03 17:26:12 +00:00
Tao Bao
39c322cefc releasetools: Fix the bug in symlink deletion.
For file-based OTAs, symlinks in the source build but not in the target
build will be deleted. However, if a symlink is replaced by a regular
file in the target build, the file will be accidentally deleted when
applying (resuming) the same package again.

Verify the checksum of a symlink that will be unpacked or renamed to.
Delete the file only if it doesn't have the target checksum.

Bug: 23646151
Change-Id: I77bae035e39f2e0be25f7f6d71c5882464e3d50f
(cherry picked from commit 84006eacd0)
2015-09-02 21:21:17 -07:00
smain@google.com
77c1ff7bf9 am 4ffdc8fa: Fix bug that caused table of Studio links to result in "stand-alone" tools instructions. bug: 23570662
* commit '4ffdc8faf2c795027f38b6ef4685dd6d1179878e':
  Fix bug that caused table of Studio links to result in "stand-alone" tools instructions. bug: 23570662
2015-08-31 21:36:29 +00:00
smain@google.com
4ffdc8faf2 Fix bug that caused table of Studio links to result in "stand-alone" tools instructions.
bug: 23570662

Change-Id: I7482eddbeffa581307bf7f76b9653de41966b6f9
2015-08-28 17:27:47 -07:00
Tao Bao
937847ae49 Split large files for BBOTA v3.
For BBOTA v3, we need to stash source blocks to support resumable
feature. However, with the growth of file size and the shrink of the
cache size, source blocks that represent a file are too large to be
stashed as a whole. CL in [1] solves the issue by replacing the diff
command with a "new" command. However, it may increase the generated
package size substantially (e.g. from ~100MB to ~400MB).

With this CL, if a file spans too many blocks, we split it into smaller
pieces by generating multiple commands. For the same case above, it
reduces the package size to ~150MB.

One potential downside is that after splitting, files like .jar,
.apk and .zip can no longer use imgdiff. We may lose the potential
benefit of using imgdiff for patch size reduction.

[1] commit 82c47981bd

Bug: 22430577
Change-Id: Iee1ad6543f3d40368e079e418cc31728e1ab3f48
(cherry picked from commit 9a5caf2c30)
2015-08-26 15:00:38 -07:00
Tao Bao
1fc67631ee Revise stash for BBOTAs when needed.
When generating incremental BBOTAs (v2 and above), we need to ensure
that the needed runtime stash is below the given threshold. If it's
running out of space on /cache, we replace the command that uses a
stash with a "new" command instead.

This may increase the OTA package size, since it is carrying more full
blocks instead of patches. It gets even worse for large files that span
a number of blocks, because currently we will store all the blocks for
the file as "new" blocks if stashing cannot be satisfied. We may further
optimize by splitting them into smaller chunks so that most of them can
still be stashed.

Bug: 22430577
Change-Id: Ieae5243d461e3f899f613f76a380f6f7c3edb356
(cherry picked from commit 82c47981bd)
2015-08-26 15:00:38 -07:00
Tao Bao
d47d8e1488 Assert the stash size when generating OTAs.
With block-based OTA v2 and v3, it requires stash space on the /cache
partition to back up blocks during an update. We need to ensure that
it doesn't exceed the partition size. Since there might be other files
on /cache as well, we use cache_size * threshold as the maximum allowed
size. The threshold defaults to 0.8, which can be overridden by command
line option '--stash_threshold'.

Change-Id: Ieee5d373c9bfb2ea401d85ca8a3adb491579de76
(cherry picked from commit 23ac404212)
2015-08-26 15:00:38 -07:00
smain@google.com
15bb28fc73 am ed7e864a: fix a few bugs in the studio download button behavior: - make button text always white (avoid blue on blue during hover) - revise logic to add the platform name to download button to avoid weird duplicity bug on small screens - remove the animation scr
* commit 'ed7e864a735f004f1dbb4a2db5261855b5693913':
  fix a few bugs in the studio download button behavior:  - make button text always white (avoid blue on blue during hover)  - revise logic to add the platform name to download button to avoid weird duplicity bug on small screens  - remove the animation script when clicking download before agree because it reloaded the page (unkown cause) depends on: https://googleplex-android-review.git.corp.google.com/#/c/752757/
2015-08-24 16:41:18 +00:00
smain@google.com
ed7e864a73 fix a few bugs in the studio download button behavior:
- make button text always white (avoid blue on blue during hover)
 - revise logic to add the platform name to download button to avoid weird duplicity bug on small screens
 - remove the animation script when clicking download before agree because it reloaded the page (unkown cause)
depends on: https://googleplex-android-review.git.corp.google.com/#/c/752757/

Change-Id: I1b2b4ff9c0b0cbbd34f1c77a2b736fe3425a16e4
2015-08-20 00:52:27 +00:00
Dirk Dougherty
8ea2636c19 am 6a8f88cd: adjust image placement for m hero on medium screens.
* commit '6a8f88cdec931470256ade35ffe6b8097425e36f':
  adjust image placement for m hero on medium screens.
2015-08-16 23:57:48 +00:00
Dirk Dougherty
6a8f88cdec adjust image placement for m hero on medium screens.
Change-Id: I644837bf151549ad8dbbfb194f8e699233362933
2015-08-14 21:19:22 -07:00
Joe Fernandez
a2869db89e am 71e0a80c: Merge "doc change: Add hero image for m and css for landing pages." into mnc-dev
* commit '71e0a80c2c2fdc26bb014685eebb874aa40f782d':
  doc change: Add hero image for m and css for landing pages.
2015-08-13 23:11:45 +00:00
Joe Fernandez
71e0a80c2c Merge "doc change: Add hero image for m and css for landing pages." into mnc-dev 2015-08-13 23:02:37 +00:00
Dirk Dougherty
083da20347 doc change: Add hero image for m and css for landing pages.
Change-Id: I52ddba716eebf821f8f5dbd888d6e3519f4284d4
2015-08-13 12:37:34 -07:00
Dianne Hackborn
897f3ba8b1 am 25abc5a3: Merge "Fix issie #23116383: Include security patch level in Settings" into mnc-dev
* commit '25abc5a38e2e7f2962463aa4e5cd407ecdde689c':
  Fix issie #23116383: Include security patch level in Settings
2015-08-13 00:54:30 +00:00
Dianne Hackborn
25abc5a38e Merge "Fix issie #23116383: Include security patch level in Settings" into mnc-dev 2015-08-13 00:46:58 +00:00
Dianne Hackborn
e593e5c42a Fix issie #23116383: Include security patch level in Settings
Change-Id: I46303c064d1365781a2c8a05bd6087518afb2aec
2015-08-12 16:29:08 -07:00
Tao Bao
67e7c66124 am 007979ee: Add support for clobbered blocks
* commit '007979ee7543a396d97b3e9ada21aca44d503597':
  Add support for clobbered blocks
2015-08-12 05:18:37 +00:00
Tao Bao
007979ee75 Add support for clobbered blocks
In ext4 filesystems, some blocks might be changed even being mounted
R/O, such as the superblock (block 0). We need to exclude such blocks
from integrity verification. Plus such blocks should always be
written to the target by copying instead of patching.

Bug: http://b/20939131
Change-Id: If9efab3d7a0071a87b4d4297daf7963c3b818afe
(cherry picked from commit ff7778166b)
2015-08-11 21:02:45 -07:00
Clay Murphy
86e510cc31 am 71a33c4d: Merge "Add the ability to display annotations in the generated docs (cherry-picked from commit 87c44d8a11) Bug: 8440225 Change-Id: I41c1c7909b283832b818b8860ffe370cd4328f20" into mnc-dev
* commit '71a33c4d5b010757423980b90681445ca2bb2be0':
  Add the ability to display annotations in the generated docs (cherry-picked from commit 87c44d8a11) Bug: 8440225 Change-Id: I41c1c7909b283832b818b8860ffe370cd4328f20
2015-08-11 21:04:24 +00:00
Omari Stephens
a76428792f Add the ability to display annotations in the generated docs
(cherry-picked from commit 87c44d8a11)
Bug: 8440225
Change-Id: I41c1c7909b283832b818b8860ffe370cd4328f20
2015-08-10 17:48:08 -07:00
Furquan Shaikh
9f5c487ef5 Merge "releasetools: Fix parameters for vboot_signer" into mnc-dr-dev 2015-08-10 19:27:36 +00:00
Furquan Shaikh
852b8de43f releasetools: Fix parameters for vboot_signer
With the change in vboot_signer (CL:744257), an additional parameter
is required to vboot_signer script. This change adds the required
parameter to releasetools as well.

BUG=23076037

Change-Id: Ice5329578b3a9bc459e278a9d404a1981b35ca88
Signed-off-by: Furquan Shaikh <furquan@google.com>
2015-08-10 11:43:45 -07:00
Tao Bao
cce673b675 Read fstab from the source build.
When creating incremental OTAs, we should always use the fstab from the
source build instead of the target.

Bug: 21948974
Change-Id: I8b6a18f64b412f782184f9d382544ed0ce093fb4
(cherry picked from commit dd24da9ec9)
2015-07-29 14:30:08 -07:00
Tao Bao
7f8ecb7f5c Merge "Zero out blocks that may be touched by dm-verity." into mnc-dev 2015-07-10 20:44:25 +00:00
Tao Bao
2fd2c9bfd6 Zero out blocks that may be touched by dm-verity.
dm-verity may touch some blocks that are not in the care_map due to
block device read-ahead. It will fail if such blocks contain
non-zeroes. As a workaround, we mark them as extended blocks and
zero out explicitly to avoid dm-verity failures.

Bug: 20881595
Change-Id: I54e24e70ad822c0d6d7af43301f74d24505f4461
2015-07-10 12:16:56 -07:00
Thierry Strudel
74a81e6633 fix device specific fs_config on build server
fs_config function from libcutils, in order to properly set the xattr FS
used to define device specific uid, gid, permissions and capabilities,
now needs TARGET_OUT make variable to be passed explicitly to all tools
using it:
  fs_config
  fs_get_stats used by mktarball.sh
  make_ext4fs used by mkuserimg.sh
  mksquashfs used by mksquashfsimage.sh

Bug: 21989305
Bug: 22048934
Change-Id: I6caf9cf870882fce2ead93027767092c29b75ded
Signed-off-by: Thierry Strudel <tstrudel@google.com>
2015-07-10 10:55:54 -07:00
Dirk Dougherty
26b3ec5a68 am 0da02191: am aee6585c: Update js/css versions and add pt-br.
* commit '0da02191ccc2030a3b4ac81500fdcabb72570049':
  Update js/css versions and add pt-br.
2015-07-08 11:44:24 +00:00
Dirk Dougherty
0da02191cc am aee6585c: Update js/css versions and add pt-br.
* commit 'aee6585c3237b11f33b83e9dd96d93449e3e2259':
  Update js/css versions and add pt-br.
2015-07-08 11:29:45 +00:00
Dirk Dougherty
bb18cb1a0c am 4187cee6: am 0b9e204d: Support matching unicode characters in suggestions by changing match(regex) to indexOf(string).
* commit '4187cee61b234a135ae2a62c876681a92e911893':
  Support matching unicode characters in suggestions by changing match(regex) to indexOf(string).
2015-07-08 11:21:57 +00:00
Dirk Dougherty
aee6585c32 Update js/css versions and add pt-br.
Change-Id: I0c5f8c8a3c77283e7f53d1c241d09aa39bca4292
2015-07-08 04:12:19 -07:00
Dirk Dougherty
4187cee61b am 0b9e204d: Support matching unicode characters in suggestions by changing match(regex) to indexOf(string).
* commit '0b9e204df09d9630db24f61bb427110501df6743':
  Support matching unicode characters in suggestions by changing match(regex) to indexOf(string).
2015-07-08 11:06:54 +00:00
Dirk Dougherty
0b9e204df0 Support matching unicode characters in suggestions by changing match(regex) to indexOf(string).
Change-Id: I460a5cb43e4be6ff552a7b2d41b6d3957f2d02a2
2015-07-02 14:21:55 -07:00
Tao Bao
41bcf3e425 Fix build.
Change-Id: Id3eb4821a3c3061063a00294bfa268693c773eb8
2015-07-01 19:38:34 -07:00
Tao Bao
8bd720257e resolved conflicts for merge of 8787cd6d to mnc-dev
Change-Id: I19497d05a021c21c905b2bddd5b36d370dc2208f
2015-07-01 18:06:33 -07:00
Tao Bao
608d9d2452 am 1aa1af0e: sparse_img.py: Don\'t write empty map groups.
* commit '1aa1af0e997699bc025e4f0a754692068328d7e6':
  sparse_img.py: Don't write empty map groups.
2015-07-02 00:47:51 +00:00
Simon Wilson
e416a41f3a am 16401ad4: Revert "sparse_img.py: Don\'t write empty map groups."
* commit '16401ad4256178fbe7a2cd8588e6dbf9a6c63180':
  Revert "sparse_img.py: Don't write empty map groups."
2015-07-02 00:47:50 +00:00
Tao Bao
8787cd6d4e resolved conflicts for merge of 7f9470cd to lmp-mr1-ub-dev
Change-Id: Icfc94fcc4178f5fbfad62df9914c84d59d140bb7
2015-07-01 17:44:53 -07:00
Tao Bao
1aa1af0e99 sparse_img.py: Don't write empty map groups.
In certain cases, we may have no mapping of ZERO or NONZERO blocks in
the image (such as squashfs at the moment). Don't write those groups if
they are empty.

Change-Id: I4a1f0105ada2e1573c3d6162457b83725e0d8971
2015-07-01 11:24:30 -07:00
Simon Wilson
16401ad425 Revert "sparse_img.py: Don't write empty map groups."
This reverts commit 7f9470cda3.

Change-Id: I97e2859903fbc4f1e6f0824269ae88b23f63e032
2015-07-01 18:10:28 +00:00
Tao Bao
7f9470cda3 sparse_img.py: Don't write empty map groups.
In certain cases, we may have no mapping of ZERO or NONZERO blocks in
the image (such as squashfs at the moment). Don't write those groups if
they are empty.

Change-Id: I82aa05fbbd79130b08868585edd5298e531c4f5a
2015-07-01 10:10:31 -07:00
Tao Bao
c7a6f1e4f8 Retry adjusting the size computation for reserved blocks.
Due to the change in https://lwn.net/Articles/546473/, kernel reserves a
few extra blocks (lesser of 2% and 4096 blocks) on ext4 FS which leads to
OTA update failures. Adjust the size computation if the device has
BOARD_HAS_EXT4_RESERVED_BLOCKS := true.

It amends the last attemp in [1]. Now it computes the used blocks from the
make_ext4fs output, instead of altering its argument.

[1]: commit efbb5d2e69.

Bug: 21522719
Bug: 22023465
Bug: 22174684
Change-Id: I9783a51abe6581ff5c75db81e78ac606d0f32c4c
2015-06-29 20:45:53 -07:00