Commit Graph

4255 Commits

Author SHA1 Message Date
Alex Klyubin
983f822d35 Merge "Command-line flag to disable signing with APK Signature Scheme v2." am: 3cc3605010
am: aafc1e9665

* commit 'aafc1e9665a3392891d54a22da8a5b7b292cfddb':
  Command-line flag to disable signing with APK Signature Scheme v2.
2016-01-21 01:42:35 +00:00
Alex Klyubin
aafc1e9665 Merge "Command-line flag to disable signing with APK Signature Scheme v2."
am: 3cc3605010

* commit '3cc36050109fa1f310f11fca980ac415cb58bee7':
  Command-line flag to disable signing with APK Signature Scheme v2.
2016-01-21 01:28:23 +00:00
Alex Klyubin
dd910c5945 Make signapk sign using APK Signature Scheme v2.
APKs are now signed with the usual JAR signature scheme and then
with the APK Signature Scheme v2.

APK Signature Scheme v2 is a whole-file signature scheme which aims
to protect every single bit of the APK as opposed to the JAR signature
scheme which protects only the names and uncompressed contents of ZIP
entries.

The two main goals of APK Signature Scheme v2 are:
1. Detect any unauthorized modifications to the APK. This is achieved
   by making the signature cover every byte of the APK being signed.
2. Enable much faster signature and integrity verification. This is
   achieved by requiring only a minimal amount of APK parsing before
   the signature is verified, thus completely bypassing ZIP entry
   decompression and by making integrity verification parallelizable
   by employing a hash tree.

Bug: 25794543
Change-Id: I275d2a6d0a98504891985309b9dfff2e0e44b878
2016-01-20 13:35:21 -08:00
Alex Klyubin
9b54a565c9 Command-line flag to disable signing with APK Signature Scheme v2.
This change makes signapk not reject the --disable-v2 command-line
flag which may be used by build scripts in some branches. The flag
is currently ignored.

This change is landed separately from the actual support for APK
Signature Scheme v2 because of unbundled branches which use prebuilt
versions of signapk.

Bug: 25794543
Change-Id: I900966244b8b6296b1f443bf98830cc7f7cc81a8
2016-01-20 12:55:16 -08:00
Tao Bao
c098e9efd9 Generate OTA packages for A/B update.
It calls brillo_update_payload to generate the payload for A/B update.
And packages the payload according to Android OTA package format.

Note that it only supports generating full/incremental OTAs with this
CL. Signing for release may not work properly at the moment.

Bug: 25715402
Change-Id: I4ac8505bacad28a572a9320dc8b52dd0f1ce47f5
2016-01-19 15:46:34 -08:00
Neil Fuller
75bbddecaa Merge "Remove synchronized from the public API docs"
am: 8cb9be66b7

* commit '8cb9be66b7878478aa61e7b752e3c8b916811299':
  Remove synchronized from the public API docs
2016-01-18 19:40:31 +00:00
Neil Fuller
8cb9be66b7 Merge "Remove synchronized from the public API docs" 2016-01-18 19:36:27 +00:00
Tianjie Xu
fb56c581ff Merge "Fix print error of numbers of blocks" am: 2acd8a2eef
am: dabcd36224

* commit 'dabcd3622433dfe43931701fbc36db61f8dca075':
  Fix print error of numbers of blocks
2016-01-15 19:41:24 +00:00
Tianjie Xu
dabcd36224 Merge "Fix print error of numbers of blocks"
am: 2acd8a2eef

* commit '2acd8a2eef88973ce222a4ed90efaa94ede1a30b':
  Fix print error of numbers of blocks
2016-01-15 19:21:00 +00:00
Neil Fuller
79a6f53d7d Remove synchronized from the public API docs
The information is not useful. Javadoc hasn't included this
information for years.

Bug: 25767152
(cherry-picked from commit a37bdc89b4)

Change-Id: Id03a6e383118ab716ce870a1d7a3740656420fe7
2016-01-15 04:52:22 +00:00
Tianjie Xu
ebe39a096a Fix print error of numbers of blocks
The total number of blocks to pack as new data was printed incorrectly.
Fix printing.

Change-Id: I6a6bb8dd6682d9c57943ceb1a728995f9529e2fd
2016-01-14 19:13:21 -08:00
Tianjie Xu
fcab264954 Merge "Adjust the size limit for splitting large files" am: 9b2fe7e0b8
am: 9ccf073210

* commit '9ccf073210b380c1526a0c51fcb815da3326b96d':
  Adjust the size limit for splitting large files
2016-01-14 20:20:26 +00:00
Tianjie Xu
9ccf073210 Merge "Adjust the size limit for splitting large files"
am: 9b2fe7e0b8

* commit '9b2fe7e0b864a7fd2deae831674d97c72fe29f64':
  Adjust the size limit for splitting large files
2016-01-14 19:22:39 +00:00
Tianjie Xu
9b2fe7e0b8 Merge "Adjust the size limit for splitting large files" 2016-01-14 19:17:00 +00:00
Tianjie Xu
bb86e1d9c2 Adjust the size limit for splitting large files
Modify the number of max blocks per transfer to reduce splitting of
large files during patch generation. This will reduce the size of
final incremental OTA updater package. In specific, the size limit
for each file to transfer is set to 1/8 cachesize instead of a fix
number.

Bug: 26472126

Change-Id: Iffb135e378c4c7a91640f2fc4c40e9e93d1fe4bb
2016-01-13 18:21:26 -08:00
Dan Willemsen
cd1bcb8b40 Merge "Allow building kati & makeparallel with soong" am: 77cde9e244
am: 766eeb747e

* commit '766eeb747ef5714f6027f371394ca08c6bc1057e':
  Allow building kati & makeparallel with soong
2016-01-14 02:08:54 +00:00
Dan Willemsen
766eeb747e Merge "Allow building kati & makeparallel with soong"
am: 77cde9e244

* commit '77cde9e244de9b043793ef528818de0ffea862e1':
  Allow building kati & makeparallel with soong
2016-01-14 02:05:24 +00:00
Colin Cross
a30aef56bb Merge "makeparallel: print path on exec failure" am: e56ef1bee7
am: dc74441928

* commit 'dc74441928aa3b7b8d0dfbac7beb02f1607d2f44':
  makeparallel: print path on exec failure
2016-01-13 23:42:45 +00:00
Dan Willemsen
3f60c4b6c0 Allow building kati & makeparallel with soong
This uses far fewer hacks in order to build these host tools, but will
require more libraries(libc++,etc) from unbundled and stripped down
branches.

Once this becomes the only option, all builds will happen after soong
runs. Then the toolchain / global cflags information will be able to be
moved from make to soong (and exported back to make).

Change-Id: I270b1d92bcef28a96fbc3ec9910d9bd0c101ac0f
2016-01-13 13:08:29 -08:00
Colin Cross
dc74441928 Merge "makeparallel: print path on exec failure"
am: e56ef1bee7

* commit 'e56ef1bee78f7b9a0c74c25087a869f382599080':
  makeparallel: print path on exec failure
2016-01-13 20:43:27 +00:00
Colin Cross
e56ef1bee7 Merge "makeparallel: print path on exec failure" 2016-01-13 20:32:45 +00:00
Alex Klyubin
44e2ccaad1 Merge "Unconditionally use SHA-256 when minSdkVersion is 18 or higher." am: fbee4f2e42
am: 45f1403b7e

* commit '45f1403b7ef6d5a9ad4910a0f1fdd4c676893049':
  Unconditionally use SHA-256 when minSdkVersion is 18 or higher.
2016-01-13 18:50:24 +00:00
Alex Klyubin
614470e77d Merge "List SHA-1 digests of APK entries\' contents in .SF files." am: 6b452b2767
am: bad18cd9cf

* commit 'bad18cd9cff1c89f26da2ab771730eb682c9a73f':
  List SHA-1 digests of APK entries' contents in .SF files.
2016-01-13 18:50:06 +00:00
Clay Murphy
c067e1d1bc Merge "Docs: Shorten feedback button text." am: a3a9d929a6
am: 308033ba6b

* commit '308033ba6b9947bc860b27dc990a5c26d8f50f49':
  Docs: Shorten feedback button text.
2016-01-13 18:49:14 +00:00
Alex Klyubin
45f1403b7e Merge "Unconditionally use SHA-256 when minSdkVersion is 18 or higher."
am: fbee4f2e42

* commit 'fbee4f2e42c31aa392869d813687c7648ae41e80':
  Unconditionally use SHA-256 when minSdkVersion is 18 or higher.
2016-01-13 18:46:25 +00:00
Alex Klyubin
c2c49ed0c1 Unconditionally use SHA-256 when minSdkVersion is 18 or higher.
SHA-1 is deprecated, but the replacement SHA-256 is only supported
for JAR/APK and OTA update package signatures on API Level 18 and
newer. This change thus adds a --min-sdk-version command-line
parameter to signapk. When this parameter is set to 18 or higher,
SHA-256 is used instead of SHA-1. When the parameter is not provided,
SHA-1 is used same as before.

This change also removes any other digests from the MANIFEST.MF.
This is to ignore any MANIFEST.MF digests already there in the APK,
such as when re-signing an already signed APK.

Build scripts will be modified to provide the --min-sdk-version
parameter in a follow-up change. This is not done in this change
because of prebuilts which require a prebuilt version of signapk
to support this parameter before the build scripts can be modified.

Bug: 25643280
Change-Id: I6a2782e465600fe2a3ad0c10bd80db2b80a6fb76
2016-01-12 13:31:59 -08:00
Alex Klyubin
bad18cd9cf Merge "List SHA-1 digests of APK entries\' contents in .SF files."
am: 6b452b2767

* commit '6b452b276773e7f1149845e99777e119cf9754ca':
  List SHA-1 digests of APK entries' contents in .SF files.
2016-01-12 21:26:01 +00:00
Alex Klyubin
6b452b2767 Merge "List SHA-1 digests of APK entries' contents in .SF files." 2016-01-12 21:22:12 +00:00
Alex Klyubin
8502937cff List SHA-1 digests of APK entries' contents in .SF files.
Due to a bug introduced in 8562fd478d
SHA-1 digests of APK entries' contents were listed under wrong
attribute name. The effect is equivalent to not listing SHA-1
digests.

This change fix the issue by listing SHA-1 digests under the correct
attribute name. However, these digests are not that useful because:
(1) typically the digest of the MANIFEST.MF verifies and thus the
per-entry digests are ignored, and (2) per-entry digests of entries
with names longer than 64 characters are wrong in any case because the
digest generation code does not take into account that such names are
split over multiple lines.

An alternative to this change would be to completely omit outputting
per-entry sections of .SF files, thus saving space and speeding up APK
verification (.SF files would decompress faster).

Bug: 26513901
Change-Id: If95d58e9baa62b1113639fe70724e1e9c9f4e15c
2016-01-12 12:36:46 -08:00
Clay Murphy
308033ba6b Merge "Docs: Shorten feedback button text."
am: a3a9d929a6

* commit 'a3a9d929a61bf0574d8372d5932af6bde2e12920':
  Docs: Shorten feedback button text.
2016-01-12 19:49:33 +00:00
Clay Murphy
b43f809da9 Docs: Shorten feedback button text.
Bug: 26452230
Change-Id: I8069d5087775a38f23e2aae86eb16fea81a65cd3
2016-01-12 10:55:44 -08:00
Colin Cross
2862458bbb makeparallel: print path on exec failure
If ninja is missing makeparallel prints an unhelpful error:
out/host/linux-x86/bin/makeparallel: exec failed: No such file or directory
which suggests that makeparallel is what is missing, not what is
reporting the error.  Print the path passed to exec as well.

Change-Id: Ic04c1cde6da9c3a974b5c43e3fb3bdb6da6605f7
2016-01-11 13:43:27 -08:00
Gina Dimino
86d7ffb6c6 Merge "Docs: Changing text on Feedback button. Bug: 26452230" am: 49d5d5576e
am: 256dbdc76d

* commit '256dbdc76d5f133c0520ff6b2f4d1fc51036adf2':
  Docs: Changing text on Feedback button. Bug: 26452230
2016-01-08 18:39:03 +00:00
Gina Dimino
256dbdc76d Merge "Docs: Changing text on Feedback button. Bug: 26452230"
am: 49d5d5576e

* commit '49d5d5576e714a733b952506bcc49d660d8a4afb':
  Docs: Changing text on Feedback button. Bug: 26452230
2016-01-08 18:37:02 +00:00
Gina Dimino
49d5d5576e Merge "Docs: Changing text on Feedback button. Bug: 26452230" 2016-01-08 18:31:38 +00:00
Tianjie Xu
3236cfd672 Merge "Check block0 for remounting partition R/W"
am: 0b109751b8

* commit '0b109751b8f767e9191f1d84f345ee70690be9fa':
  Check block0 for remounting partition R/W
2016-01-08 00:54:12 +00:00
Tianjie Xu
0b109751b8 Merge "Check block0 for remounting partition R/W" 2016-01-08 00:49:49 +00:00
Gina Dimino
261bb0871d Docs: Changing text on Feedback button.
Bug: 26452230

Change-Id: I716b773ed649dea4634f3db3fcb9daba0d0fab86
2016-01-07 16:22:36 -08:00
Tianjie Xu
3d49222496 Merge "Check block0 for remounting partition R/W" 2016-01-07 01:32:31 +00:00
Gina Dimino
fe6c64d4e3 Merge "Docs: Encode URL input to search box Bug: 26287939" am: 634e4a2a39
am: e1e7d93cfe

* commit 'e1e7d93cfe40b1cd5823b1eab5371350f629238f':
  Docs: Encode URL input to search box Bug: 26287939
2016-01-06 17:43:40 +00:00
Gina Dimino
e1e7d93cfe Merge "Docs: Encode URL input to search box Bug: 26287939"
am: 634e4a2a39

* commit '634e4a2a39b32df838d750374ce390fa25f1710b':
  Docs: Encode URL input to search box Bug: 26287939
2016-01-06 17:41:52 +00:00
Gina Dimino
bbde9363fa Docs: Encode URL input to search box
Bug: 26287939

Change-Id: Ica656034412b517e182333f5fe4f6e9bc5f300f3
2016-01-05 15:08:40 -08:00
Elliott Hughes
097c21f873 Merge "Clean up Mac OS hacks in acp slightly." am: 0e80edd259
am: b938cbc7a7

* commit 'b938cbc7a7c0d98892e6268c45823861c05217fd':
  Clean up Mac OS hacks in acp slightly.
2016-01-05 17:50:26 +00:00
Elliott Hughes
b938cbc7a7 Merge "Clean up Mac OS hacks in acp slightly."
am: 0e80edd259

* commit '0e80edd259d1ce7f35d8c9841f88296416c1e2cf':
  Clean up Mac OS hacks in acp slightly.
2016-01-05 17:48:29 +00:00
Elliott Hughes
636c1c4a44 Clean up Mac OS hacks in acp slightly.
Change-Id: I7cba3a345cd8907ae050961cc4f173003ac90f39
2016-01-05 09:32:42 -08:00
Tao Bao
c27ad030b6 Merge "Allow building recovery as boot."
am: 781b7b20d4

* commit '781b7b20d41cfe80472707aec46d0eac5473bfc5':
  Allow building recovery as boot.
2015-12-21 19:22:00 +00:00
Daniel Rosenberg
40ef35b9e9 Allow building recovery as boot.
With BOARD_USES_RECOVERY_AS_BOOT = true, we skip building the
non-ramdisk boot.img but building the recovery image as boot.img. It
contains recovery's ramdisk (e.g. with /sbin/recovery). It depends on
the bootloader parameter (skip_initramfs) to determine the actual mode
to boot into.

Change-Id: Id6e2d0a2b94383944ca8f35bba688c6401745622
(cherry picked from commit d80bef2b9e)
2015-12-21 11:17:08 -08:00
Tao Bao
3f4b9da837 Merge "Allow building recovery as boot." 2015-12-21 19:15:56 +00:00
Sami Tolvanen
642dbdff66 Merge "build_image: don\'t call append2simg for FEC" am: e2476f82a1
am: ba788ce6e6

* commit 'ba788ce6e66aa1b6d54bd2ff1fd66d55a59b8acd':
  build_image: don't call append2simg for FEC
2015-12-21 11:32:51 +00:00
Sami Tolvanen
6ff173640d Merge "build_image: remove an unnecessary call to append2simg" am: 06b4ff6696
am: c734083df3

* commit 'c734083df345828848b64799c7287c82a8dae1c1':
  build_image: remove an unnecessary call to append2simg
2015-12-21 11:32:42 +00:00