Commit graph

3829 commits

Author SHA1 Message Date
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
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
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
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
Colin Cross
37241826f8 Merge "makeparallel: reset make\'s unlimited stack" am: a034129
am: 15f63e2

* commit '15f63e262ea685ff593e5e8c320ab88b0b15d878':
  makeparallel: reset make's unlimited stack

Change-Id: Iffb1189b6e883dbe7730cff571fb2836987aa66d
2016-04-07 18:12:57 +00:00
Alex Klyubin
60817689fa Remove support for DSA with SHA-512 from v2 signing.
Android platform does not support DSA with SHA-512. Thus, it does not
make sense to support this unsupported algorithm in APK Signature
Scheme v2.

Bug: 24331392
Change-Id: Ifba90ad5b11188bb968c28d9e0ed3f9cb13ce2e7
2016-04-07 10:24:56 -07:00
Colin Cross
8f9a53258b makeparallel: reset make's unlimited stack
make 3.81 sets its own stack size to be unlimited, but accidentally
leaves it unlimited for all child processes.  If it is unlimited, reset
it back to a reasonable default (8MB).

See http://savannah.gnu.org/bugs/?22010

Change-Id: Ieb0289823f12a421b59d8ab5292d3df3c6dfc27e
2016-04-06 17:59:14 -07:00
Maria Bornski
885dbb5111 Correct usage message for build_image.py
target_out_dir is now a required argument. Include this in the usage message.

Change-Id: If77d94ec5350b2c737d1dd1df28a51167b173058
2016-04-06 17:26:31 -07:00
Trevor Johns
a5f006873c Merge branch 'goog/mnc-mr-docs' into mnc-ub-dev
Large merge to reconnect automerger for docs branch to mainline.

 Conflicts:
	tools/droiddoc/templates-sdk/assets/css/default.css
	tools/droiddoc/templates-sdk/sdkpage.cs

Issue: 28000173
Change-Id: If04c741090d99d384981b8b3554edc58eb82dd0e
2016-04-05 20:32:32 -07:00
Amanda Kassay
ebcf3977a2 Tabs js error fix, DevSite css issues fix, Search filtering
Staged: http://akassay.nyc.corp.google.com:8080/index.html#q=Activity
Change-Id: Id25525a8d8c927ea67cd13b43652d75ce53733cf
2016-04-05 20:46:13 +00:00
smain@google.com
190e610df3 new styles and tab-highlighting to support custom Android Studio site design
Change-Id: I27d11f4526ba79bce8deb5102cc2afbe34a0e116
2016-04-05 11:13:12 -07:00
Mark Salyzyn
62b696af33 Merge "fs_config: introduce TARGET_FS_CONFIG_GEN" am: 54cb05c
am: 43284e2

* commit '43284e2dc5e1c802226bf1608dd85d33ad22907a':
  fs_config: introduce TARGET_FS_CONFIG_GEN

Change-Id: Idd4879971867f697a20c42dda4fcdf8086fd358f
2016-04-05 00:09:17 +00:00
smain@google.com
7281802438 tweak the NDK download analytics event tag
Change-Id: I822d744f7f370330a26f0ff612de357dbe1005fe
2016-04-04 16:17:01 -07:00
Mark Salyzyn
54cb05c01a Merge "fs_config: introduce TARGET_FS_CONFIG_GEN" 2016-04-04 22:37:33 +00:00
Dirk Dougherty
c607a4d4d5 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.

Change-Id: Ibc4ddb4a6130ab8bd8d6044472022465829f2000
2016-04-04 12:45:04 -07:00
Chih-Hung Hsieh
84a2f2ac51 Merge "Recognize more Clang-Tidy google warning patterns." am: 29667bf
am: f6601e6

* commit 'f6601e6f7e1d070189c8f763e1eab2957086c352':
  Recognize more Clang-Tidy google warning patterns.

Change-Id: Ied251994be7f327628d6e43519322afe18a24e02
2016-04-01 16:35:07 +00:00
Chih-Hung Hsieh
d742e90fe9 Recognize more Clang-Tidy google warning patterns.
* Many AOSP C/C++ code have google-readability warnings.

Bug: http://b/27779618
Change-Id: Ic7d33b957da5c1062410f48ef18bb68a5aa259e9
2016-03-31 16:14:55 -07:00