Commit Graph

4044 Commits

Author SHA1 Message Date
Tao Bao
00dbe29173 target_files_diff: Fix the issue with file type change.
When a file is switched from a regular file to a symlink, we should skip
the comparasion.

Bug: 28373409
Change-Id: I8fef00ab9f2d6f811fde1cadf595e8bd46af2dfd
(cherry picked from commit f31a6deeee)
2016-04-25 11:29:48 -07:00
Dirk Dougherty
1a2dbb64a8 Update samples_navtree cs template to include generated _yaml from samples TOC.
Change-Id: Ied2bd5b3e58d9eb2c10e8bc10678aa5d02ef1794
2016-04-25 11:26:11 -07:00
Alex Klyubin
3f52653abf Separate logic for alg selection for OTA and APK signing.
The rules for which digest algorithms are accepted by the Android
platform for APK signatures and OTA update package signatures are
different. For example, the set of digest algorithms accepted for APK
signatures depends on the signing key algorithm and the platform's
API Level. Whereas the set of digest algorithms accepted for OTA
update package signatures by Recovery depends on the list produced
by the build system, which in turn produces the list based on the
key algorithm and digest used in the signing certificate.

To reflect this reality, this refactoring CL explicitly separates
signapk's logic for choosing the digest algorithm to use for v1
signing from its logic for choosing the digest algorithm to use for
OTA update package signing.

Bug: 28296599
Change-Id: Ic7aa77e89622d727e985f8749071284746be7f45
2016-04-25 11:15:27 -07:00
smain@google.com
4194fc52a5 remove version number from download button at bottom of page.
Change-Id: I4e2b510a0ff88b987b5b9a65b6a7e89d043e946a
(cherry picked from commit ba761ab333)
2016-04-25 17:58:05 +00:00
smain@google.com
ba761ab333 remove version number from download button at bottom of page.
Change-Id: I4e2b510a0ff88b987b5b9a65b6a7e89d043e946a
2016-04-25 10:56:30 -07:00
Tao Bao
f31a6deeee target_files_diff: Fix the issue with file type change.
When a file is switched from a regular file to a symlink, we should skip
the comparasion.

Bug: 28373409
Change-Id: I8fef00ab9f2d6f811fde1cadf595e8bd46af2dfd
2016-04-25 10:07:20 -07:00
Trevor Johns
aedf6592a2 Merge "Revert "Revert "Merge "Resolve merge conflicts of a5f0068 to nyc-dev" into nyc-dev""" into nyc-dev
am: 0f0b536

* commit '0f0b53623e8a64cebc74d2bc9ef48dacac192ec0':
  Revert "Revert "Merge "Resolve merge conflicts of a5f0068 to nyc-dev" into nyc-dev""

Change-Id: I2f05586d98e54b47ac38434561dd2027f4abcb34
2016-04-20 21:04:30 +00:00
Trevor Johns
0f0b53623e Merge "Revert "Revert "Merge "Resolve merge conflicts of a5f0068 to nyc-dev" into nyc-dev""" into nyc-dev 2016-04-20 18:35:57 +00:00
Trevor Johns
4ff8891dd2 Revert "Revert "Merge "Resolve merge conflicts of a5f0068 to nyc-dev" into nyc-dev""
This reverts commit bf234fdfba.
2016-04-19 01:15:39 -07:00
William Roberts
c498f4dad0 Merge "fs_config: include both oem ranges" am: 27e0d48
am: 8e20023

* commit '8e20023bb959de7eff1e4bcc75a82644097b45e8':
  fs_config: include both oem ranges

Change-Id: I0f244d50e93e71381adc93083b0b894a220a6331
2016-04-18 21:27:19 +00:00
Treehugger Robot
27e0d48f0b Merge "fs_config: include both oem ranges" 2016-04-18 20:35:27 +00:00
Amanda Kassay
01febb9675 Fix for double header and footer on ndk download pages: b/27950742
https://android-dot-devsite.googleplex.com/ndk/downloads/index.html

Fix for html code in page title and h1 tag: b/28237039
https://android-dot-devsite.googleplex.com/guide/topics/manifest/manifest-element.html

Change-Id: Idc9ba0a1ba33d1b89b7dbfd3d620d0e587c57459
2016-04-18 18:19:48 +00:00
Scott Main
848295aea9 Merge "Remove nav toggle and up-nav for desktop size screens and remove breadcrumbs for the Studio docs, because these are not needed when there's only one level of "tabs"" into mnc-mr-docs 2016-04-15 21:29:04 +00:00
Tao Bao
314719a0b6 Merge "Skip verifying the partition with no changed blocks." into nyc-dev
am: 05ce0a9

* commit '05ce0a94a5a6eec3113b62a39f97401e6a3fb3a0':
  Skip verifying the partition with no changed blocks.

Change-Id: I8a3a9f8fe7bcf25fd719940d883a22a7adcfdef9
2016-04-15 03:29:42 +00:00
Tao Bao
962dfdcdac Skip verifying the partition with no changed blocks.
For incremental BBOTAs, commit [1] changed to verify only the touched
blocks to reduce the update time. This CL fixes the bug when there's no
changed block between the two builds.

[1]: commit d522bdc9ed

Bug: 27813356
Bug: 28195498
Change-Id: Ia752d3cf034c544517458ed15df509d4596e21fa
(cherry picked from commit f9efe284a4)
2016-04-14 20:23:17 -07:00
Tao Bao
f9efe284a4 Skip verifying the partition with no changed blocks.
For incremental BBOTAs, commit [1] changed to verify only the touched
blocks to reduce the update time. This CL fixes the bug when there's no
changed block between the two builds.

[1]: commit d522bdc9ed

Bug: 27813356
Bug: 28195498
Change-Id: Ia752d3cf034c544517458ed15df509d4596e21fa
2016-04-14 16:12:06 -07:00
Amanda Kassay
2bb3328965 Added html escape for search queries to fix XSS issue
b/28135307

Change-Id: Ifd1a0eadbdb726558446af4860986d1af55b77ae
2016-04-14 16:48:37 +00:00
David Zeuthen
39b6a8db6a Merge "Add support for Brillo partitioning." am: 2528968
am: 93a3423

* commit '93a34234c6a032251163992728def631c14a6e90':
  Add support for Brillo partitioning.

Change-Id: I349463c75e8ddb312cf83bad845864e530c50405
2016-04-14 16:20:15 +00:00
David Zeuthen
2528968871 Merge "Add support for Brillo partitioning." 2016-04-14 16:04:30 +00:00
smain@google.com
80beb0a145 Remove nav toggle and up-nav for desktop size screens
and remove breadcrumbs for the Studio docs, because these are
not needed when there's only one level of "tabs"

Also deleted a strangely redundant screen-size declaration for the header-tabs visiblity.

For now this applies only to Studio docs (body.studio selector).
Later, we should update the Android templates to use a new class
in the body such as "no-global-nav" to trigger these styles

Change-Id: If398814871980b56e3e0484244dee364198d687c
2016-04-13 19:08:44 -07:00
Tao Bao
24105eaab8 Merge "releasetools: Only verify the blocks to be touched." into nyc-dev
am: 21528c5

* commit '21528c5e053e28cd52d603eded53ffaf36d22637':
  releasetools: Only verify the blocks to be touched.

Change-Id: I053c7da789c44916456109c5153f6628fe38c849
2016-04-14 00:02:41 +00:00
Tao Bao
d4caaae160 releasetools: Only verify the blocks to be touched.
For incremental BBOTAs, we used to verify the integrity of all the
blocks in the source partition. In order to reduce the time cost under
recovery, this CL changes to only verify the blocks that will be touched
in the given OTA package (BBOTA >= 3 only). This is a trade-off between
performance and reliability.

Bug: 27813356
Change-Id: I3975ae6f461f0f7e58d24f1df7df46a449d2988b
(cherry picked from commit d522bdc9ed)
2016-04-13 17:00:34 -07:00
Tao Bao
21528c5e05 Merge "releasetools: Only verify the blocks to be touched." into nyc-dev 2016-04-13 23:59:36 +00:00
Tianjie Xu
c6e9dc5343 Merge "Monotonic flag sets incorrectly in rangelib" am: 323e3d4
am: afc92d1

* commit 'afc92d1d45a8ee4de14a059fa4039b5a6dbe072a':
  Monotonic flag sets incorrectly in rangelib

Change-Id: I9b8eeb6e357aee66720c1776a383533016aa1269
2016-04-13 22:06:55 +00:00
Tianjie Xu
8e1fb06f38 Monotonic flag sets incorrectly in rangelib
After applying update_target_files_incr_ext4.sh, some files may end up
occupying unsorted block fragments. In one example, an apk file has the
block range [258768-259211,196604]. The monotonic flag in rangelib sets
incorrectly for this example and leads to a bad input file for imgdiff.
After fixing the flag, bsdiff is called instead of imgdiff and the
incremental OTA package generates successfully.

Bug:28053885
(cherry picked from commit cd1e16a761)

Change-Id: If286eb382e59b3084a8313ae853b807e4648e5a2
2016-04-13 15:02:20 -07:00
Tianjie Xu
323e3d4c18 Merge "Monotonic flag sets incorrectly in rangelib" 2016-04-13 21:48:53 +00:00
Tianjie Xu
cd1e16a761 Monotonic flag sets incorrectly in rangelib
After applying update_target_files_incr_ext4.sh, some files may end up
occupying unsorted block fragments. In one example, an apk file has the
block range [258768-259211,196604]. The monotonic flag in rangelib sets
incorrectly for this example and leads to a bad input file for imgdiff.
After fixing the flag, bsdiff is called instead of imgdiff and the
incremental OTA package generates successfully.

Bug:28053885
Change-Id: Ib841bf449ff6a29314fc4a1b8fba941a6dc532ac
2016-04-13 12:36:14 -07:00
Tianjie Xu
dea8b94f98 Merge "Remove post-install verification" 2016-04-13 19:19:03 +00:00
David Zeuthen
25328627ba Add support for Brillo partitioning.
To generate partition tables in the Android build system, simply add
the path to a .bpt file to the BOARD_BPT_INPUT_FILES variable.

 BOARD_BPT_INPUT_FILES += "hardware/bsp/vendor/soc/board/board-specific.bpt"

The variable BOARD_BPT_DISK_SIZE can be used to specify or override
the disk size, for example:

 BOARD_BPT_DISK_SIZE := "10 GiB"

Additional arguments to 'bpttool make_table' can be specified in the
variable BOARD_BPT_MAKE_TABLE_ARGS.

If BOARD_BPT_INPUT_FILES is set, the build system generates two files

 partition-table.img
 partition-table.bpt

in ${ANDROID_PRODUCT_OUT} using 'bpttool make_table'. The former is
the binary partition tables generated using bptool's --output_gpt
option and the latter is a JSON file generated using the --output_json
option. These files will also be put in the IMAGES/ directory of
target-files.zip when running 'm dist'.

BUG=27831397
TEST=Manually tested.

Change-Id: Iedd15354afb2dd483dcb9bc001360b2a37fd6dc0
2016-04-13 12:45:20 -04:00
Tao Bao
d522bdc9ed releasetools: Only verify the blocks to be touched.
For incremental BBOTAs, we used to verify the integrity of all the
blocks in the source partition. In order to reduce the time cost under
recovery, this CL changes to only verify the blocks that will be touched
in the given OTA package (BBOTA >= 3 only). This is a trade-off between
performance and reliability.

Bug: 27813356
Change-Id: I3975ae6f461f0f7e58d24f1df7df46a449d2988b
2016-04-12 16:41:01 -07:00
Tianjie Xu
bf7981c24f Merge "Remove post-install verification" into nyc-dev
am: 3ebddd4

* commit '3ebddd40e0b3c0848bb066e1e39c406c7a852100':
  Remove post-install verification

Change-Id: I9622385ef80c32a2a98dbac492fcc45f48f1918d
2016-04-12 22:49:49 +00:00
Tianjie Xu
618a81e818 Remove post-install verification
post-install verification calls range_sha1() and checks if the given
partition has expected contents. It takes roughly 20 seconds on
angler with 2.8G system image. Remove it to speed up OTA update. Also
abort the update if block_image_update() fails, as we were relying on
post-install verification to capture block_image_update() failures.

cherry-picked from commit b2deb22033
Bug: 27729678
Change-Id: I8123cd8929295ec26df247acf6bb51df813771d9
2016-04-12 15:41:14 -07:00
Tianjie Xu
3ebddd40e0 Merge "Remove post-install verification" into nyc-dev 2016-04-12 22:38:24 +00:00
Trevor Johns
1348277a29 Revert "Merge "Resolve merge conflicts of a5f0068 to nyc-dev" into nyc-dev"
This reverts commit 6edfbfabad, reversing
changes made to e09b2c16e3.
(cherry picked from commit bf234fdfba)

Change-Id: Id57aecad79fb601488799ed99437118d1a9faf7c
2016-04-12 18:45:12 +00:00
Tianjie Xu
b2deb22033 Remove post-install verification
post-install verification calls range_sha1() and checks if the given
partition has expected contents. It takes roughly 20 seconds on
angler with 2.8G system image. Remove it to speed up OTA update. Also
abort the update if block_image_update() fails, as we were relying on
post-install verification to capture block_image_update() failures.

Bug: 27729678
Change-Id: I8123cd8929295ec26df247acf6bb51df813771d9
2016-04-12 11:40:03 -07:00
Trevor Johns
18c202a7d3 Merge "Revert "Merge "Resolve merge conflicts of a5f0068 to nyc-dev" into nyc-dev"" into nyc-dev 2016-04-12 17:59:02 +00:00
Trevor Johns
bf234fdfba Revert "Merge "Resolve merge conflicts of a5f0068 to nyc-dev" into nyc-dev"
This reverts commit 6edfbfabad, reversing
changes made to e09b2c16e3.
2016-04-12 10:35:42 -07:00
Tao Bao
41e5c4e065 releasetools: Use fixed timestamp in otacerts.zip.
am: 7ee3a96

* commit '7ee3a9678e7191c48f0ba4e04792fe97925c1aa1':
  releasetools: Use fixed timestamp in otacerts.zip.

Change-Id: I9e8260491819e00eea6f4eb55b1722ae1670ae85
2016-04-12 15:44:31 +00:00
Tao Bao
83cd79d340 releasetools: Use fixed timestamp in otacerts.zip.
We were using zipfile.write() to write system/etc/security/otacerts.zip
when signing for release. It led to unexpected timestamp change in the
generated otacerts.zip and non-idempotent signed images when signing the
same target_files.zip.

Replace with common.ZipWrite() to always use a fixed timestamp.

Bug: 28122968
Change-Id: Ia6cf4b7d380cbf72ed7050ebb60c932dc8826d87
(cherry picked from commit 7ee3a9678e)
2016-04-12 08:34:43 -07:00
Tao Bao
7ee3a9678e releasetools: Use fixed timestamp in otacerts.zip.
We were using zipfile.write() to write system/etc/security/otacerts.zip
when signing for release. It led to unexpected timestamp change in the
generated otacerts.zip and non-idempotent signed images when signing the
same target_files.zip.

Replace with common.ZipWrite() to always use a fixed timestamp.

Bug: 28122968
Change-Id: Ia6cf4b7d380cbf72ed7050ebb60c932dc8826d87
2016-04-11 23:10:00 -07:00
Trevor Johns
35142509fb Merge "Resolve merge conflicts of a5f0068 to nyc-dev" into nyc-dev
am: 6edfbfa

* commit '6edfbfabad1ddbda00e0fcc713672f6e63acdf44': (44 commits)
  Tabs js error fix, DevSite css issues fix, Search filtering
  new styles and tab-highlighting to support custom Android Studio site design
  tweak the NDK download analytics event tag
  Update modal download dialogs for sdk/ndk download. Revise the redirect behavior once download completes. Add more appropriate title and download message when installing SDK tools only. Force refresh when the Studio download dialog is dismissed, to avoid leaving the dialog in stale state. Add styles for the Studio download page.
  increment version for fetched js and cs files to avoid proxy caching.
  Migrating web search api to custom search api on templates-sdk
  new search results layout. no more custom suggestions; just API matches and organic results.
  remove dev guide search suggestions, move organic search results up. tweak the search suggest for reference pages
  Adding book metadata to doc head, fix tabs for content build, fix for reference page double footer.
  increment docs.js version to force browser refresh. needed to load recent fixes to the zippies.
  update zippy icons to use material arrow (up/down instead of right/down). fixes bug 27695580, which was caused because I previously submitted an update to the code doclava templates to do this but did not update the current site templates in kind.
  Docs: Change MD5 to SHA1 in NDK download table column heading
  change name of offline doc tab to "API reference" and put the version number in the secondary nav bar (it was there anyway).
  Fix broken suggestions for preview.
  Revert "Search for suggestion matches across PREVIEW_RESOURCES."
  Docs: Updates NDK download table for NDKr11
  make image resource URLs relative so they work in offline docs
  docs: Update DAC template to force refresh of resources
  Add new templates directory for "reference only" builds. The only difference is that this changes the masthead.cs file to show a different header.
  Add styles to compress the summary table presentation.
  ...

Change-Id: I47a5c85da5c4f8edffa9ca3e6ba4bb573cc2666c
2016-04-11 22:16:20 +00:00
Trevor Johns
f719c29ea9 Resolve merge conflicts of a5f0068 to nyc-dev
Change-Id: Id0d573566abb989a173349ffaf01390cebd51607
2016-04-11 14:55:35 -07:00
Dan Willemsen
23f326a67d Ensure prebuilt executables are executable
Use 'chmod +x' to make sure that they're executable, even if the source
file is not.

Bug: 28097475
Change-Id: Id155f6b4ff188f5c909fd6237fd64183af264f79
(cherry picked from commit 08420cbc8a)
2016-04-11 11:21:47 -07:00
William Roberts
580f2c405d fs_config: include both oem ranges
Support both OEM and OEM2 ranges as defined by
private/android_filesystem_config.h.

Change-Id: I1aef62fa446301bb68b0309b198f3fe8b5eb92c7
Signed-off-by: William Roberts <william.c.roberts@intel.com>
2016-04-09 08:39:22 -07:00
Mohamad Ayyash
230ef583b0 Merge "Use fs_config files for mksquashfs" into nyc-dev
am: b354a61

* commit 'b354a61f3ec3b4c6463aac2a80f23e5772b6b164':
  Use fs_config files for mksquashfs

Change-Id: I422bd6f5b8e7e587bec3caef1525497904268a96
2016-04-08 17:52:24 +00:00
Mohamad Ayyash
8837882fb9 Use fs_config files for mksquashfs
BUG: 27467028
Change-Id: I7648030ad4b31d70a5d439e9552fd2cbfe288b74
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
2016-04-07 22:10:51 -07:00
Ying Wang
be667a1128 Merge "Correct usage message for build_image.py" am: d63ec28
am: 334a418

* commit '334a4185a5ca29086963a8d450fb7a9e972cbd77':
  Correct usage message for build_image.py

Change-Id: Iee000ee9974b4cb7329fab87dc81fdba2affe93d
2016-04-07 22:24:15 +00:00
Ying Wang
d63ec28bcf Merge "Correct usage message for build_image.py" 2016-04-07 21:51:21 +00:00
Alex Klyubin
5f520cef37 Merge "Remove support for DSA with SHA-512 from v2 signing." am: d71e120
am: a62efba

* commit 'a62efba64f0e352310ecf7b5eb15727a1d52bdf9':
  Remove support for DSA with SHA-512 from v2 signing.

Change-Id: I1e0757fe57118ee6012ebb28ffcae8bb604a2c25
2016-04-07 20:11:05 +00:00
Alex Klyubin
d71e12028b Merge "Remove support for DSA with SHA-512 from v2 signing." 2016-04-07 19:56:03 +00:00