Commit graph

3837 commits

Author SHA1 Message Date
Tao Bao
9f884e6c55 releasetools: Add support for --override_timestamp.
We use the timestamps in builds to determine a downgrade, which might
not be always the truth. For examples, two builds cut from different
branches may carry timestamps in a reverse order. An incremental package
won't be able to be pushed nor applied, based on the timestamp
comparison.

We used to handle such a case with manual work, by setting the
post-timestamp to (pre-timestamp + 1) in the package metadata. This CL
automates the process by adding a new flag --override_timestamp.

Note that it doesn't change anything in the installed image, but only
affects the assertions for pushing / installing the package.

With the change in this CL:
 - If it's a downgrade without any extra flag, fail the package
   generation (we only print warnings prior to this CL);
 - If it's a downgrade with --downgrade flag, generate a downgrade
   package with forced data wipe (same as before);
 - If it's a downgrade with --override_timestamp, generate a normal
   incremental with hacked timestamp (pre-timestamp + 1) (new in this CL
   to avoid the manual change);
 - If it's not a downgrade but with any of the above two flags specified,
   fail the package generation.

Bug: 33744169
Test: Generate an incremental from builds with reversed timestamps.
Change-Id: I8b187d32708b4a7c3e20f8c6adb8f9527b73b965
Merged-In: I8b187d32708b4a7c3e20f8c6adb8f9527b73b965
(cherry picked from commit 3e6161a3b3)
2017-03-16 11:26:06 -07:00
Tao Bao
99c17252ac releasetools: Support generating downgrade A/B OTAs.
We already support generating downgrade OTAs for non-A/B devices (with
mandatory data wipe), but we have missed the --downgrade flag in A/B OTA
path.

This CL factors out the function that writes the downgrade metadata, and
fixes the path for generating A/B OTAs.

Bug: 35094540
Bug: 36183651
Test: Generate incrementals with --downgrade for A/B and non-A/B OTAs.
Change-Id: I30b9bf83e69e8aba3be666507681b555db6ab743
Merged-In: I30b9bf83e69e8aba3be666507681b555db6ab743
(cherry picked from commit b31892e5de)
2017-03-16 16:47:10 +00:00
Tao Bao
77620b5a45 Revert "Revert "releasetools: Allow using futility-host to sign old TF.zip.""
This reverts commit d6145b6a16.

The cause of the earlier breakage has been identified and fixed by
commit 4b577413ff.

Bug: 35467608
Test: lunch ryu-userdebug; m dist otatools-package
(cherry picked from commit 4f30f7cfa1)
2017-02-25 08:38:51 -08:00
Tao Bao
d6145b6a16 Revert "releasetools: Allow using futility-host to sign old TF.zip."
Broke ryu targets.

This reverts commit 31a0de00a4.

Change-Id: I3ffcdc604a1cb92c86c574b5cd358d0148430d55
2017-02-21 20:27:27 +00:00
Tao Bao
31a0de00a4 releasetools: Allow using futility-host to sign old TF.zip.
Commit e98fb7a8d3 switched to using
futility-host instead of the prebuilt futility. This CL adds support to
handle signing old TF.zip that still says "futility=prebuilt/..." in
META/misc_info.txt.

Bug: 35467608
Test: Generate otatools.zip and sign an old ryu TF.zip.
Change-Id: I48a9cc918c7afce361e1ec9bc4f85f74fa92566e
(cherry picked from commit 4f104d1b94)
2017-02-17 23:36:00 -08:00
Tao Bao
cd4f7c96c0 releasetools: Use java_path in sign_target_files_apks.py.
Prior to this CL, it was calling the hard-coded "java" although it was
accepting a "--java_path" option.

Also switch OPTIONS.java_args from string to list. Otherwise it won't
work when providing multiple args.

Bug: 32737832
Test: Specify "--java_path=" and "--java_args" when invoking
      sign_target_files_apks.py with "-v". Check the commands being
      called.
Change-Id: Id7ef98e778646d532027434de7fba9b7a104dbd0

(cherry picked from commit e95540e060)
2016-11-09 17:05:28 -08:00
Tao Bao
c7814837a0 releasetools: Support verity signer args.
system/extras/verity/build_verity_metadata.py now accepts
"--signer_args" to specify verity signer args.

Also remove the duplicate "--verity_signer_args" in
add_img_to_target_files.py, as we already have that in common.py.

Bug: 31500665
Test: Building and signing work w/ and w/o --signer_args.

Change-Id: I02f59c50a1ebf15c5505e9fffd5b9bbbbaa785be
(cherry picked from commit 458104266f)
2016-10-25 21:17:02 -07:00
Dirk Dougherty
8d565ed204 Fix samples metadata concat.
Change-Id: Ie9b616818995b3066d0e65ea1aa30077ed9d82ce
2016-10-07 12:12:50 -07:00
Amanda Kassay
b5c04107af Adding excludeFromSuggestions, wear preview project path, and android wear/tv/auto/versions projectsw to template
b/31771704 b/31903798 b/31773716

Staged:
https://android-dot-devsite.googleplex.com/about/versions/nougat/index.html
https://android-dot-devsite.googleplex.com/index.html
https://android-dot-devsite.googleplex.com/wear/preview/index.html

Change-Id: Idf9893f9d108c26038ead06c84de771e21b89f37
2016-10-05 22:31:22 +00:00
Dirk Dougherty
a9fcf48078 For ds builds only, emit a separate metadata file for samples only.
Change-Id: I95c03a10cca586c6675f98664479ba8bf2e43576
2016-09-30 17:33:50 -07:00
Przemyslaw Szczepaniak
a7edd92c45 Fix for non-empty a[name] tags in openJdk based javadocs.
openJdk based android javadoc contains <a name=... tags
that are non-empty. Currently they are being hidden,
causing badly formatted pages for some java.* classes
(missing text and random whitespace blocks).

This change makes the existing a[name] hiding rule
apply only to empty tags.

Test: make docs
Bug: 31700998
Change-Id: Ifa75bbabe308d7aed0cce6165c1113e5a382a121
2016-09-26 16:36:03 +00:00
Dirk Dougherty
fc61720cd5 Support "ID" lang code in place of "IN".
Change-Id: I56632e638fdda81e494cbb7080502b35393a291f
2016-09-21 18:29:18 -07:00
Scott Main
64bd41ff7d Merge "add support for constraint layout's DATA list" into nyc-dev 2016-09-10 01:28:09 +00:00
smain@google.com
7055897faa add support for constraint layout's DATA list
Change-Id: Ia301ad235dcfd5a5c2bb13bfa6daa753f9206800
2016-09-09 15:47:58 -07:00
smain@google.com
6c8efecbda delete 'templates-sdk-dev', all these files were merged
back into 'templates-sdk' with this CL:
https://googleplex-android-review.git.corp.google.com/#/c/1394582/
and this depends on the following CL to update all the doc build targets:
https://googleplex-android-review.git.corp.google.com/#/c/1406302/

Change-Id: Id38134e1d35c5235bb66241c50945b55ac9de1dd
2016-09-02 11:02:41 -07:00
smain@google.com
4f3a05a2c6 Merge all of templates-sdk-dev into templates-sdk.
I actually just deleted templates-sdk/ then made a copy of templates-sdk-dev/
and then renamed it to templates-sdk/. So this is a clean copy.
Once this goes through cleanly, I'll delete templates-sdk-dev/ and update
all doc targets to use templates-sdk/.

Change-Id: I276695969e02fcf718370564e84b077a9d43725e
2016-08-31 11:30:02 -07:00
smain@google.com
6d00e69c3f delete templates-ds (the original attempt to template docs for devsite)
delete templates-sdk-refonly (the "dev branch" for the reference only flag)

Change-Id: I73e2760fcca76b7242be9aefa92006df3a555a03
2016-08-30 13:55:16 -07:00
Scott Main
1b1c5c5ebc Merge "delete no-longer-used custom sdkpage template. depends on https://googleplex-android-review.git.corp.google.com/#/c/1389393/" into nyc-dev 2016-08-30 20:39:44 +00:00
Scott Main
a7e978b6b6 Merge "update templates-sdk-dev to support the referenceonly build. includes an updated snapshot of the css and js files from devsite" into nyc-dev 2016-08-30 20:39:20 +00:00
smain@google.com
42859fae46 delete no-longer-used custom sdkpage template.
depends on https://googleplex-android-review.git.corp.google.com/#/c/1389393/

Change-Id: Idd8f039294fe8c2c6dddf6d8a00a196222154d58
2016-08-30 10:52:40 -07:00
smain@google.com
eeeb9b832a update templates-sdk-dev to support the referenceonly build.
includes an updated snapshot of the css and js files from devsite

Change-Id: Ib597c1dd488347795e02e1d09880559ead1d54e0
2016-08-30 10:22:51 -07:00
Amanda Kassay
c9ef9fea7f Remove hard coded leading slash in head_tag.cs for DevSite image_path meta tag.
Change-Id: I994148882b2f4fbe233f02eb8e35c335af0c32f8
2016-08-29 17:13:49 -04:00
Dirk Dougherty
baa86c7bfe Misc cleanup for static doc pages. Remove extra line breaks in output, clean up formatting, remove elements and attrs not needed in ds builds.
Change-Id: Iceea38241b08fd9571d26862f0468f8b25da7f1c
2016-08-21 11:40:19 -07:00
Dirk Dougherty
8aec568883 update dac legacy templates for N release.
Change-Id: I746e5cd15ff7485a69df6006a9302408e9e38c5b
2016-08-18 19:34:32 -07:00
Amanda Kassay
594392adec Adding project path metadata to head_tag.cs
Change-Id: I031e5c1f1c2dd4763c43f0bfde03eb2fa8831472
2016-08-16 13:38:33 +00:00
Joe Fernandez
99aacfe834 docs: Add TOC template logic for ARC docs
b/30114799

Change-Id: If36c3f9d46bf916b56b2884446451d423565606c
2016-08-01 17:15:14 -07:00
David Friedman
e0b9229915 Docs: Adding info in support of TOC for new Performance section.
Bug:
Change-Id: Iad34b8d3294ddea714c8933a60fb2615811ac019
2016-06-27 16:40:20 -07:00
Tianjie Xu
b64439b291 Limit the number of blocks in command zero
Limit the number of blocks in command zero to 1024 blocks. This
prevents the target size of one command from being too large and
might help to avoid fsync errors during the OTA update.

Bug: 29535618
Change-Id: Ic630cea2599138516162bd0029e2e4b2af75bf4f
(cherry picked from commit bb848c54a7)
2016-06-21 23:19:30 +00:00
Mohamad Ayyash
8ebbc4e7e2 Merge "squashfs: make disable-4k-align a parameter" into nyc-dev 2016-06-16 16:24:34 +00:00
Mohamad Ayyash
1b6d3485fc squashfs: make disable-4k-align a parameter
BUG: 29388879
Change-Id: I121d2b76db5fb269e2f7152abb2e78098437a0d5
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
2016-06-15 16:37:21 -07:00
Mohamad Ayyash
3bddf74752 Merge "Pass block_list param to mksquashfs" into nyc-dev 2016-06-15 16:03:08 +00:00
Tao Bao
293fd135c7 releasetools: Disable using imgdiff for squashfs.
We use imgdiff to handle files in zip format (e.g. jar/zip/apk) for
higher compression ratio.

For system/vendor in squashfs, a) all files are compressed in LZ4
format; b) we use 4096-byte block size in their sparse images, but the
files in squashfs may not be laid out as 4K-aligned. So the blocks for
a given file as listed in block map may not form a valid zip file, which
may fail the patch generation with imgdiff.

Disable using imgdiff for squashfs images, and use bsdiff instead.

Bug: 22322817
Change-Id: Ie76aa4cece5c9d38cb1d1a34c505a4a8f37512d3
2016-06-13 10:04:23 -07:00
Mohamad Ayyash
c3484f7f64 Pass block_list param to mksquashfs
Needed to generate image.map and to optimize the OTA size

BUG: 22322817
Change-Id: I7802f4dbb9116a94ea99a00b68c3a7ff180ef08a
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
2016-06-13 09:48:05 -07:00
Tianjie Xu
d06f07eef4 Add build.version.incremental to metadata
Add the build property "build.version.incremental" of the source (if
present) and target files to the metadata of the ota update package.

Example of metadata:
....
post-build-incremental=2951741
post-timestamp=1465345123
pre-build-incremental=2943039
pre-device=bullhead
...

Bug: 28658632
Change-Id: I889e8ccf39633b1b35590751001a42d1b05d5514
2016-06-09 17:54:46 -07:00
Dirk Dougherty
a5bce98621 Fix improper date reference in blog reader. am: 2732bb762a am: 0f6d425804
am: 53cd365b2d

* commit '53cd365b2d2c2b074d628147a8a382275075bd1d':
  Fix improper date reference in blog reader.

Change-Id: I300892c3c4439354917872839c18e4c029160df1
2016-05-26 23:49:38 +00:00
Dirk Dougherty
53cd365b2d Fix improper date reference in blog reader. am: 2732bb762a
am: 0f6d425804

* commit '0f6d425804d7fd60dc82b9fe0c4ce585aa9e5eed':
  Fix improper date reference in blog reader.

Change-Id: I9641b21d8841f2847836c691eba8bfb89497417d
2016-05-26 23:46:18 +00:00
Dirk Dougherty
0f6d425804 Fix improper date reference in blog reader.
am: 2732bb762a

* commit '2732bb762a00828f36bda77c43c7fd14c7495cde':
  Fix improper date reference in blog reader.

Change-Id: I5ff0d1d2b16ae712b6e92ef64c023574d2e7bfe5
2016-05-26 23:43:35 +00:00
Dirk Dougherty
2732bb762a Fix improper date reference in blog reader.
Change-Id: I9f1a32a68da2d21ea02b95df8cd7dfc4396a445f
2016-05-26 13:05:10 -07:00
Amanda Kassay
7bea848abd Revert "Updated default.css and docs.js for DoD transition fallback." am: 8bac6eb880 am: 0eefec03a7
am: ecaacf87cd

* commit 'ecaacf87cd038beb4aad5d6ddc6c1cc1725dca4a':
  Revert "Updated default.css and docs.js for DoD transition fallback."

Change-Id: I07e3e36f3dd322fde3067e63a66ac9f5e87e7385
2016-05-26 18:33:54 +00:00
Amanda Kassay
ecaacf87cd Revert "Updated default.css and docs.js for DoD transition fallback." am: 8bac6eb880
am: 0eefec03a7

* commit '0eefec03a76e5e0201293331dd67baf52dc13ceb':
  Revert "Updated default.css and docs.js for DoD transition fallback."

Change-Id: I9dc0292d9615d5cd1f888a4ac92b45b0b3d6ffb4
2016-05-26 18:28:40 +00:00
Amanda Kassay
0eefec03a7 Revert "Updated default.css and docs.js for DoD transition fallback."
am: 8bac6eb880

* commit '8bac6eb880992e0a4dd37b0f1cf039feebb483ae':
  Revert "Updated default.css and docs.js for DoD transition fallback."

Change-Id: I33f169f14f2e7b993e30c00fe59016357242f288
2016-05-26 18:22:56 +00:00
Amanda Kassay
8bac6eb880 Revert "Updated default.css and docs.js for DoD transition fallback."
This reverts commit 4d5bcbf62a.

Change-Id: I45dc33a7711f435fd35b51bb0cb44445e6edd918
2016-05-26 17:58:23 +00:00
Tianjie Xu
209db46be1 Report error codes in the OTA update script
Modify the abort() function in the OTA update generation script to
report an error code. The recoveryimage will parse the code and write it
into last_install for further data analysis.

Bug: 28934032
Change-Id: I2d62f81fd352c3102fb84f054972ac0ecb965a21
2016-05-25 12:22:31 -07:00
Billy Lamberta
f06c24f0c1 docs: work minisite am: 09304b21b3
am: 05f772fe6b

* commit '05f772fe6bb53190477d6b92e8098d53994cfdbf':
  docs: work minisite

Change-Id: Ifff07a8a5d6b5aa9011226ec8d512f5e800ff4df
2016-05-16 22:21:47 +00:00
Billy Lamberta
05f772fe6b docs: work minisite
am: 09304b21b3

* commit '09304b21b33f13480d4df58b53df89e6e1356537':
  docs: work minisite

Change-Id: I3ee5ddd408506dbdce2168e8aeaa3a1a87442005
2016-05-16 22:15:52 +00:00
Billy Lamberta
09304b21b3 docs: work minisite
Changes needed to build the new directory
frameworks/base/docs/html/work. Support for
resource cards and navigation.

bug: 27744376
Change-Id: I8556eb0e2cf86eb83be395a97306d220394827cd
2016-05-16 14:15:06 -07:00
Joe Fernandez
f1ed84693e docs: Wear Preview - update TOC navigation behavior am: f8e4e54b89
am: f9601a7ad2

* commit 'f9601a7ad261772cf0f89df267de6998fd65cc48':
  docs: Wear Preview - update TOC navigation behavior

Change-Id: I4304642d26f0b975cb50bfdd53a04167d186b268
2016-05-16 01:13:40 +00:00
Joe Fernandez
f9601a7ad2 docs: Wear Preview - update TOC navigation behavior
am: f8e4e54b89

* commit 'f8e4e54b89cf381a725e8be9e05eee2bb94b0f2c':
  docs: Wear Preview - update TOC navigation behavior

Change-Id: I9cbf81eec6b55a40d573c0160b7f7936bd0eb621
2016-05-16 01:10:52 +00:00
Joe Fernandez
f8e4e54b89 docs: Wear Preview - update TOC navigation behavior
b/28004352

Change-Id: I1818c7b0def80e5871a0e6abf0353e9216164e1f
2016-05-15 17:56:44 -07:00
Amanda Kassay
600ccf1185 Updated default.css and docs.js for DoD transition fallback. am: 4d5bcbf62a am: 613cf217cf
am: 18840d1ecb

* commit '18840d1ecbeeb4691e61a5745757c56af95d87fc':
  Updated default.css and docs.js for DoD transition fallback.

Change-Id: I2b1a4174aee4c85df917431135529798790fd8cf
2016-05-14 15:35:22 +00:00