Commit graph

2993 commits

Author SHA1 Message Date
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
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
Tao Bao
2384d01c1c Revert "Adjust the size computation for reserved blocks"
We should not change the parameter to mkfs_ext4. Bug filed at
b/22174684. Will come up with a new CL.

This reverts commit efbb5d2e69.

Change-Id: I15f7a9a07a65a936ba186d2ce672ec4832ed3e17
2015-06-29 12:55:38 -07:00
Mohamad Ayyash
07a7590f08 Merge "build_image.py: Make sparse squashfs images" into mnc-dev 2015-06-24 23:15:56 +00:00
Simon Wilson
6d5ddc32ab resolved conflicts for merge of ecfc97f7 to mnc-dev
Change-Id: Ic7661c4176dc87cb2796f9cbb61bdd64f89cdc01
2015-06-24 16:06:34 -07:00
Mohamad Ayyash
48cb24a655 am 648e40e8: build_image.py: Make sparse squashfs images
* commit '648e40e8660135f37adad5981a48250476c2f3fd':
  build_image.py: Make sparse squashfs images
2015-06-24 22:52:10 +00:00
Simon Wilson
ecfc97f772 resolved conflicts for merge of f86e7eea to lmp-mr1-ub-dev
Change-Id: I746021aa57edd5f6fae6e57cec0908951a659664
2015-06-24 15:42:27 -07:00
Mohamad Ayyash
9ca7fa8993 resolved conflicts for merge of 1b748051 to lmp-mr1-ub-dev 2015-06-24 15:04:38 -07:00
Mohamad Ayyash
648e40e866 build_image.py: Make sparse squashfs images
Change-Id: Iea0399868a9406f9929d8176d61d5698a2043697
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
2015-06-24 10:54:16 -07:00
Mohamad Ayyash
fa6c8a9b79 build_image.py: Make sparse squashfs images
Change-Id: Iea0399868a9406f9929d8176d61d5698a2043697
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
2015-06-24 10:44:52 -07:00
Tao Bao
7102f57781 Merge "Adjust the size computation for reserved blocks" into mnc-dev 2015-06-24 00:53:17 +00:00
Tao Bao
2b4ff174ff Fix the error in sparse_img.py
Bug: 22046423
Change-Id: I9c257002c405277557974fadfe27942c38c3cd04
2015-06-23 17:36:10 -07:00
Tao Bao
efbb5d2e69 Adjust 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.

Bug: 21522719
Bug: 22023465
Change-Id: I49f16adbf2dedc5279fbb8622bf99ef71dcc494f
2015-06-23 14:53:28 -07:00
Tao Bao
bebd3cfbf9 Use fstab in the source build
When generating incremental OTAs, we should use the fstab in the source
build instead of the target one. Similarly for recovery_mount_options.

Bug: 22011892
Change-Id: Idb5c72d1a792e8bb40376a380e3dc06136b13652
2015-06-22 19:27:59 -07:00
Simon Wilson
f86e7eeabc Add compressor options for squashfs system images
Change-Id: I2a75f8754273f6e00b96ba6aca6741c4388f5da8
2015-06-22 15:42:52 -07:00
David Friedman
275ed9c5ab am 552de126: am 42c75239: Merge "Docs: Fixing disappearance of the left-navs in NDK minisite." into mnc-preview-docs
* commit '552de126e9b05b1c34db1c66a62615fc2ea3cee1':
  Docs: Fixing disappearance of the left-navs in NDK minisite.
2015-06-17 22:12:06 +00:00
David Friedman
552de126e9 am 42c75239: Merge "Docs: Fixing disappearance of the left-navs in NDK minisite." into mnc-preview-docs
* commit '42c752392ceea6854c423339eedede6f4fdf6696':
  Docs: Fixing disappearance of the left-navs in NDK minisite.
2015-06-17 21:57:47 +00:00
David Friedman
42c752392c Merge "Docs: Fixing disappearance of the left-navs in NDK minisite." into mnc-preview-docs 2015-06-17 21:51:07 +00:00
David Friedman
c997cf910b Docs: Fixing disappearance of the left-navs in NDK minisite.
When the filepath changed from html-ndk/ndk/ to html/ndk, the build
system could no longer find the _toc files. This change fixes that issue.

Change-Id: I51f19159e6636fb90ed04013b11d7f95fb4e04c3
2015-06-17 14:36:05 -07:00
Mohamad Ayyash
1b748051dd common.py: Add support for squashfs
Change-Id: Ia40f8c6307d0213d43207aee91c4c8a5b5ad6f1e
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
2015-06-16 13:18:44 -07:00
Mohamad Ayyash
cade49ddee Allow flashing a squashfs system image
Change-Id: Ic51d11274784a8d2e9d57d5f0b821ebc89680e5a
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
2015-06-16 13:11:21 -07:00
Tao Bao
548eb76c8f Support SELinux context label when mounting
If there is a SELinux context label in the recovery.fstab, we should
honor that when mounting the partition.

Bug: 19764039
Change-Id: I4df71a092b418cd340a18b2e3b0936de33d8e3f5
2015-06-10 15:35:34 -07:00
Baligh Uddin
601ddeae06 Allow custom boot_signer and verity_signer.
Bug: 21701163
Change-Id: I85e75fd3a166a9f6a7859ebf81dee73322dc2798
2015-06-09 15:48:14 -07:00
Luan Nguyen
18985e7661 am 30b16ac6: am 95a1818f: Merge "docs: Add styles for embedded videos to match DevSite" into mnc-preview-docs
* commit '30b16ac6a4d4658d927d48476081de7542b5989f':
  docs: Add styles for embedded videos to match DevSite
2015-06-05 02:27:29 +00:00
Tao Bao
726b7f338f Fix the broken signing script
check_target_files_signatures.py was accidentally broken due to the
renaming of a variable in last commit. It escaped the checking from
pylint because it was a keyword ('all').

Bug: 21611858
Change-Id: I58c983e59c4a3e0018481d3c9ba328ed76f5c08a
2015-06-03 17:36:12 -07:00
Luan Nguyen
30b16ac6a4 am 95a1818f: Merge "docs: Add styles for embedded videos to match DevSite" into mnc-preview-docs
* commit '95a1818f50c685f903635ae84076199015cc9c78':
  docs: Add styles for embedded videos to match DevSite
2015-06-03 18:25:23 +00:00
Luan Nguyen
95a1818f50 Merge "docs: Add styles for embedded videos to match DevSite" into mnc-preview-docs 2015-06-03 18:13:17 +00:00
Luan Nguyen
94c1826a72 docs: Add styles for embedded videos to match DevSite
Change-Id: I68cc9a7340db43fd23d7072bf867d53a2e180c4c
2015-06-03 09:56:54 -07:00
Tao Bao
5fcaaeffc3 Add post-install verification for BBOTAs
Similar to the assertations in file-based OTA, we perform verification
for block-based OTAs (BBOTAs) after updating a partition, for both of
the incremental and full OTAs. It increases the update time (~20s on
Nexus 6), but will capture unnoticed errors right away.

Bug: 21500869
Change-Id: I0f8b27734caaa0f41f9c1b904d55af2112784a68
(cherry picked from commit 68658c0f4f)
2015-06-02 11:15:33 -07:00
Dirk Dougherty
bdbf074186 am f89524c8: am 6c231420: Merge "increment metadata versions." into mnc-preview-docs
* commit 'f89524c80bb2fa6550fff1ff3bed6a257a80f64a':
  increment metadata versions.
2015-05-28 21:36:26 +00:00
Dirk Dougherty
f89524c80b am 6c231420: Merge "increment metadata versions." into mnc-preview-docs
* commit '6c2314206fd4500500062fa2f774d4deb498ec58':
  increment metadata versions.
2015-05-28 21:24:53 +00:00
Dirk Dougherty
6c2314206f Merge "increment metadata versions." into mnc-preview-docs 2015-05-28 21:07:43 +00:00