Commit Graph

23683 Commits

Author SHA1 Message Date
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
fdd713fa78 am fbecca31: am e35d00d0: am 265d9aeb: releasetools: Update the fingerprint when signing.
* commit 'fbecca3143e8046b416791f8c51aff353bec58b1':
  releasetools: Update the fingerprint when signing.
2015-09-12 23:14:37 +00:00
Tao Bao
fbecca3143 am e35d00d0: am 265d9aeb: releasetools: Update the fingerprint when signing.
* commit 'e35d00d019aaff92b5e20b86d9c3b8222c0c946a':
  releasetools: Update the fingerprint when signing.
2015-09-12 23:07:41 +00: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
8eedce188b am 8eb3ac18: am 28f6f9c3: releasetools: Always write the last block if it\'s padded.
* commit '8eb3ac18adb4e8e44b1b984eb0b40f6b20adeae8':
  releasetools: Always write the last block if it's padded.
2015-09-08 20:35:53 +00:00
Tao Bao
8eb3ac18ad am 28f6f9c3: releasetools: Always write the last block if it\'s padded.
* commit '28f6f9c3deb4d23fd627d15631d682a5cfa989fc':
  releasetools: Always write the last block if it's padded.
2015-09-08 20:30:51 +00: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
92e373489a am de4177d8: am a6e6afbc: am 39c322ce: releasetools: Fix the bug in symlink deletion.
* commit 'de4177d8158a741bf6f90a96d8c6fa1d24e48818':
  releasetools: Fix the bug in symlink deletion.
2015-09-03 18:25:59 +00:00
Tao Bao
de4177d815 am a6e6afbc: am 39c322ce: releasetools: Fix the bug in symlink deletion.
* commit 'a6e6afbce69da968299898944bb2165f5e799886':
  releasetools: Fix the bug in symlink deletion.
2015-09-03 18:14:42 +00: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
Zach Jang
cf7e78cca0 am 36890dac: am 9f7c3781: am 057831bc: Merge "Set the Security Patch level with Oct 1 for MNC" into mnc-dev
* commit '36890dac855b41cba77125337d6bbce1da33fd80':
  Set the Security Patch level with Oct 1 for MNC
2015-09-02 00:21:21 +00:00
Zach Jang
36890dac85 am 9f7c3781: am 057831bc: Merge "Set the Security Patch level with Oct 1 for MNC" into mnc-dev
* commit '9f7c37811bc65cda63bd863d00ed7b7489c02bd2':
  Set the Security Patch level with Oct 1 for MNC
2015-09-02 00:10:34 +00:00
Zach Jang
9f7c37811b am 057831bc: Merge "Set the Security Patch level with Oct 1 for MNC" into mnc-dev
* commit '057831bc665b15d7beda970b91b2c332dee417f0':
  Set the Security Patch level with Oct 1 for MNC
2015-09-02 00:04:40 +00:00
Zach Jang
057831bc66 Merge "Set the Security Patch level with Oct 1 for MNC" into mnc-dev 2015-09-01 23:51:02 +00:00
Badhri Jagan Sridharan
28dd99d8ea am a0eb142a: am dfea066f: Merge "Include init.usb.configfs.rc into rootdir" into mnc-dr-dev
* commit 'a0eb142a4623cca9c977ae7cc687f2f41e98e192':
  Include init.usb.configfs.rc into rootdir
2015-09-01 23:27:20 +00:00
Badhri Jagan Sridharan
a0eb142a46 am dfea066f: Merge "Include init.usb.configfs.rc into rootdir" into mnc-dr-dev
* commit 'dfea066f880f14d7203302ab667b9f096b210c08':
  Include init.usb.configfs.rc into rootdir
2015-09-01 23:07:58 +00:00
Badhri Jagan Sridharan
dfea066f88 Merge "Include init.usb.configfs.rc into rootdir" into mnc-dr-dev 2015-09-01 22:57:27 +00:00
Badhri Jagan Sridharan
a8a4a93733 Include init.usb.configfs.rc into rootdir
Bug=23633457

Change-Id: I26bbc5ff597138b2ccac1de72117753739b31554
2015-09-01 22:43:42 +00:00
Tao Bao
1599e380bc am a125075a: am ccad82c5: Merge "Revert "Temporarily use blockimgdiff v2 for OTA."" into mnc-dr-dev
* commit 'a125075a5fd0e599d622e288b798cdc3fefe27ac':
  Revert "Temporarily use blockimgdiff v2 for OTA."
2015-09-01 19:21:02 +00:00
Tao Bao
a125075a5f am ccad82c5: Merge "Revert "Temporarily use blockimgdiff v2 for OTA."" into mnc-dr-dev
* commit 'ccad82c52e7c37c70fce579cf14377a88b885ae4':
  Revert "Temporarily use blockimgdiff v2 for OTA."
2015-09-01 19:10:11 +00:00
Tao Bao
ccad82c52e Merge "Revert "Temporarily use blockimgdiff v2 for OTA."" into mnc-dr-dev 2015-09-01 19:02:24 +00:00
smain@google.com
59bc470107 am deb3c8c4: am 77c1ff7b: am 4ffdc8fa: Fix bug that caused table of Studio links to result in "stand-alone" tools instructions. bug: 23570662
* commit 'deb3c8c4533035df6bd4dc7e88b400b1d71e7a42':
  Fix bug that caused table of Studio links to result in "stand-alone" tools instructions. bug: 23570662
2015-08-31 21:57:17 +00:00
smain@google.com
deb3c8c453 am 77c1ff7b: am 4ffdc8fa: Fix bug that caused table of Studio links to result in "stand-alone" tools instructions. bug: 23570662
* commit '77c1ff7bf983ef4622ecb227d4e5b0c75728c28f':
  Fix bug that caused table of Studio links to result in "stand-alone" tools instructions. bug: 23570662
2015-08-31 21:46:46 +00: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
Tao Bao
50827e0d95 am 29c245e8: am e337093e: Merge changes from topic \'stash-size\' into mnc-dr-dev
* commit '29c245e803496625cb3b72719f1cdce8d73de041':
  Split large files for BBOTA v3.
  Revise stash for BBOTAs when needed.
  Assert the stash size when generating OTAs.
2015-08-31 21:18:08 +00:00
Tao Bao
29c245e803 am e337093e: Merge changes from topic \'stash-size\' into mnc-dr-dev
* commit 'e337093e6c5d502f0f4094639b41c001b3048d0f':
  Split large files for BBOTA v3.
  Revise stash for BBOTAs when needed.
  Assert the stash size when generating OTAs.
2015-08-31 21:10:06 +00:00
Tao Bao
e337093e6c Merge changes from topic 'stash-size' into mnc-dr-dev
* changes:
  Split large files for BBOTA v3.
  Revise stash for BBOTAs when needed.
  Assert the stash size when generating OTAs.
2015-08-31 20:59:48 +00:00
Zach Jang
4d034675f0 Set the Security Patch level with Oct 1 for MNC
- MNC currently has security patches from the August OEM bulletin with patch date of Sep 1 plus only critical fixes from September OEM bulletin
- To be cherry-picked if picking up remaining fixes from September OEM bulletin to MNC

Change-Id: I2d1ba9c5a893727962f3f1837df1dd9df49e44f5
2015-08-31 10:12:17 -07: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
Ying Wang
c586468d2e am 27bc97e6: am f4ad2feb: am 4fc14679: am fc168f84: resolved conflicts for merge of 1a8c6567 to lmp-mr1-ub-dev
* commit '27bc97e6e14c663e5e55c6a934cc485cadbe9e33':
  Don't fail build of otatools if there are no device certificates
2015-08-27 01:53:54 +00:00
Ying Wang
43aff506e3 am a5223697: am d0cc11e8: am 8f7c08ed: am 1e120181: am 473b6a5f: am fc028e59: Dist the otatools package.
* commit 'a5223697189736e413e09f49801cfbcf029c8d58':
  Dist the otatools package.
2015-08-27 01:53:53 +00:00
Ying Wang
27bc97e6e1 am f4ad2feb: am 4fc14679: am fc168f84: resolved conflicts for merge of 1a8c6567 to lmp-mr1-ub-dev
* commit 'f4ad2febdb6f87a08e5f8229b0f3b2d8a7dc25de':
  Don't fail build of otatools if there are no device certificates
2015-08-27 01:46:10 +00:00
Ying Wang
a522369718 am d0cc11e8: am 8f7c08ed: am 1e120181: am 473b6a5f: am fc028e59: Dist the otatools package.
* commit 'd0cc11e89827e4f5b1526b909e138493cfb96da6':
  Dist the otatools package.
2015-08-27 01:46:09 +00:00
Ying Wang
f4ad2febdb am 4fc14679: am fc168f84: resolved conflicts for merge of 1a8c6567 to lmp-mr1-ub-dev
* commit '4fc1467949aaf9e6a49a6771ed996e3c2c702314':
  Don't fail build of otatools if there are no device certificates
2015-08-27 01:37:54 +00:00
Ying Wang
d0cc11e898 am 8f7c08ed: am 1e120181: am 473b6a5f: am fc028e59: Dist the otatools package.
* commit '8f7c08ed622d733c0997324d5b0464ba7e57c1fa':
  Dist the otatools package.
2015-08-27 01:37:53 +00:00
Ying Wang
4fc1467949 am fc168f84: resolved conflicts for merge of 1a8c6567 to lmp-mr1-ub-dev
* commit 'fc168f84695f492f2ad0eed3063145f425bebf45':
  Don't fail build of otatools if there are no device certificates
2015-08-27 01:33:15 +00:00
Ying Wang
8f7c08ed62 am 1e120181: am 473b6a5f: am fc028e59: Dist the otatools package.
* commit '1e120181f0a9240eca61dface4fb4530bf2594ab':
  Dist the otatools package.
2015-08-27 01:27:37 +00:00
Ying Wang
fc168f8469 resolved conflicts for merge of 1a8c6567 to lmp-mr1-ub-dev
Change-Id: Iadb7c55c246705ac10c6822b7bb5d71794ce485b
2015-08-26 17:03:18 -07:00
Tao Bao
7540c08807 Revert "Temporarily use blockimgdiff v2 for OTA."
This reverts commit d07bfc5196.

Real fixes [1][2][3] are ready to merge. Time to revert the workaround.

[1] commit d47d8e1488
[2] commit 1fc67631ee
[3] commit 937847ae49

Bug: 22430577
Change-Id: Icd6623e8717c93ad1f12cd1ba43db5e006e928ad
2015-08-26 15:29:00 -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
Ying Wang
1e120181f0 am 473b6a5f: am fc028e59: Dist the otatools package.
* commit '473b6a5f2b00f941acb08b5c3df59cbbdf647609':
  Dist the otatools package.
2015-08-26 20:17:16 +00:00
Claes Elgemark
1a8c656704 am 8d771971: Don\'t fail build of otatools if there are no device certificates
* commit '8d771971212069f77851163f437c782f581bf6db':
  Don't fail build of otatools if there are no device certificates
2015-08-26 17:14:49 +00:00
Claes Elgemark
8d77197121 Don't fail build of otatools if there are no device certificates
Bug: 23552169
Change-Id: I32723701d952ef2243ce0234132fa9876f0f21b6
2015-08-26 10:07:16 -07:00
Bart Sears
e23a407b2d am 8239d21b: am 8a1fa158: am c69aa42b: Merge "Set the Security Patch level for MNC" into mnc-dev
* commit '8239d21bc82d0b14c3f5a9709cbeeb3b44a5d61c':
  Set the Security Patch level for MNC
2015-08-26 04:01:04 +00:00
Bart Sears
8239d21bc8 am 8a1fa158: am c69aa42b: Merge "Set the Security Patch level for MNC" into mnc-dev
* commit '8a1fa15844e0ad73d3b327ff567012e485e7896d':
  Set the Security Patch level for MNC
2015-08-26 03:55:25 +00:00
Bart Sears
8a1fa15844 am c69aa42b: Merge "Set the Security Patch level for MNC" into mnc-dev
* commit 'c69aa42b4331569814d23336412e6754a0495d65':
  Set the Security Patch level for MNC
2015-08-26 03:49:10 +00:00