Commit Graph

5250 Commits

Author SHA1 Message Date
Tianjie Xu 17867754ef Merge "Improve the comment in AddSplitTransfers" am: cca4a4c993 am: 4b57c28908
am: 65bee4ee78

Change-Id: Id74b344092f70d1da29ac3a5c33e3bba75742c5f
2017-11-29 22:07:06 +00:00
Tianjie Xu 65bee4ee78 Merge "Improve the comment in AddSplitTransfers" am: cca4a4c993
am: 4b57c28908

Change-Id: I7108dd09f0f3f48c84135827cf9a6e190d63d034
2017-11-29 22:01:58 +00:00
Tianjie Xu 4b57c28908 Merge "Improve the comment in AddSplitTransfers"
am: cca4a4c993

Change-Id: I853cd62997a964b91324d079e6940926c889ba6d
2017-11-29 21:57:52 +00:00
Tianjie Xu 41390d4e1e Improve the comment in AddSplitTransfers
Bug: 69624507
Test: build an incremental package
Change-Id: I54dac0a2ddcc19b722e352fb19d53ff20444fa42
2017-11-22 11:35:18 -08:00
Tianjie Xu d4e59044a1 Merge "Fall back to normal split if imgdiff fails when splitting large apks" am: 520c9f0f5f am: ff9efd3290
am: a40db9c53b

Change-Id: I151967860c3d4ddd4c6bcb902f57f3786f8d78bf
2017-11-22 19:09:44 +00:00
Tianjie Xu a40db9c53b Merge "Fall back to normal split if imgdiff fails when splitting large apks" am: 520c9f0f5f
am: ff9efd3290

Change-Id: Ib5215b6cf42973d62023cc1f10750729ad2f52e8
2017-11-22 18:55:40 +00:00
Tianjie Xu ff9efd3290 Merge "Fall back to normal split if imgdiff fails when splitting large apks"
am: 520c9f0f5f

Change-Id: I0db7558c996cc515a79a99ce1d27525728a041dc
2017-11-22 18:46:04 +00:00
Tianjie Xu 520c9f0f5f Merge "Fall back to normal split if imgdiff fails when splitting large apks" 2017-11-22 18:28:31 +00:00
Tianjie Xu f68b50f963 Fall back to normal split if imgdiff fails when splitting large apks
Imgdiff expects the input files to be valid zip archives. During the
split of large apks, imgdiff may fail when there's a hole in the input
file; potentially due to the blocks allocation of mke2fs. This CL solves
the issue by falling back to normal split in case of the imgdiff split
failure. The split transfers will then use bsdiff instead.

Bug: 69624507
Test: generate the incremental package for the failed targets and check the
transfers.
Change-Id: I4882452378123e60ad3434053b57f33e53ac4b82
2017-11-21 23:37:36 -08:00
Tao Bao 9a49d8ef47 Merge "check_ota_package_signature.py: Set up PYTHONPATH." am: 9f686938da am: 51f5d3360e
am: 56671edd93

Change-Id: Ic7ab87ff1f80a1820758662d3ba1de373c2f8072
2017-11-21 21:47:27 +00:00
Tao Bao 56671edd93 Merge "check_ota_package_signature.py: Set up PYTHONPATH." am: 9f686938da
am: 51f5d3360e

Change-Id: Iadb00273671818cb45df56dedc349356ef6a67ce
2017-11-21 21:44:18 +00:00
Tao Bao 51f5d3360e Merge "check_ota_package_signature.py: Set up PYTHONPATH."
am: 9f686938da

Change-Id: Ie84a386dd6acc44fd1fba987e8f0a5703248cd59
2017-11-21 21:40:13 +00:00
Tao Bao d2ae0b0613 check_ota_package_signature.py: Set up PYTHONPATH.
... to include system/update_engine/scripts if ANDROID_BUILD_TOP is set
(e.g. after lunching a target).

Test: ./build/make/tools/releasetools/check_ota_package_signature.py
      works without manually setting PYTHONPATH.
Change-Id: I0c5101fab2dd69cb6a598b909aa04bc4d5f45284
2017-11-21 11:30:27 -08:00
Tao Bao c87c6f068d Merge "releasetools: Allow building AVB-enabled recovery.img." am: 37066490a5 am: 4d1764b0be
am: e5e6611c29

Change-Id: If6b829d23e578c168ba5a55d90ca175a0c32f13a
2017-11-21 17:15:09 +00:00
Tao Bao e5e6611c29 Merge "releasetools: Allow building AVB-enabled recovery.img." am: 37066490a5
am: 4d1764b0be

Change-Id: I6adf6a44fcb7fda2b06c815ff819add0e5645ed1
2017-11-21 17:12:30 +00:00
Tao Bao 4d1764b0be Merge "releasetools: Allow building AVB-enabled recovery.img."
am: 37066490a5

Change-Id: Ie8393a7e81c4f056a12a0be5ed2cd07ed54ef76b
2017-11-21 17:07:57 +00:00
Tao Bao 37066490a5 Merge "releasetools: Allow building AVB-enabled recovery.img." 2017-11-21 17:02:35 +00:00
Colin Cross 93c73f957f Merge "Convert signtos to Android.bp" am: 80ec993a58 am: bb051769c2
am: 0f36226f15

Change-Id: I834542c241e5d9071529f5960f010460fe6d9fdd
2017-11-21 03:38:21 +00:00
Colin Cross 0f36226f15 Merge "Convert signtos to Android.bp" am: 80ec993a58
am: bb051769c2

Change-Id: I3fef8edc7f1c901cf1fc67e16b83e3259a1ab5ad
2017-11-21 03:35:44 +00:00
Colin Cross bb051769c2 Merge "Convert signtos to Android.bp"
am: 80ec993a58

Change-Id: I5ddb92b0ca0485b01860aaff6ae613d5276eedb8
2017-11-21 03:33:06 +00:00
Colin Cross 3c363ad729 Convert signtos to Android.bp
See build/soong/README.md for more information.

Test: m checkbuild
Change-Id: Ia468cde0492e64858b7a603deba9b22b95e56ff4
2017-11-21 03:26:31 +00:00
Tao Bao e54c2150ea Merge "releasetools: Always create IMAGES/ directory." am: db7dfacb96 am: a41e00784b
am: 32c91c9c31

Change-Id: I2aeb55b993bbc90ea2945ae6c00128c0edd033ca
2017-11-20 22:57:27 +00:00
Tao Bao 32c91c9c31 Merge "releasetools: Always create IMAGES/ directory." am: db7dfacb96
am: a41e00784b

Change-Id: I91f7bc071f531f10ed8d49e3eab06ca1f1abd9b1
2017-11-20 22:52:50 +00:00
Tao Bao a41e00784b Merge "releasetools: Always create IMAGES/ directory."
am: db7dfacb96

Change-Id: Iaede3e35fdd64dc748a98f625d390f0f38cd7e4a
2017-11-20 22:50:01 +00:00
Tao Bao bf70c318b7 releasetools: Allow building AVB-enabled recovery.img.
Bug: 68224784
Test: Enable AVB on aosp_bullhead-userdebug. `m dist`. Note that the
      prebuilt vendor.img needs to be AVB-signed first.
Test: `m dist` with aosp_walleye-userdebug.
Change-Id: I18235e4d0dde6af71a96e46ec434480cc9a22bef
2017-11-20 12:44:18 -08:00
Tao Bao ae396d9b0c releasetools: Always create IMAGES/ directory.
AddImagesToTargetFiles() takes either a zip file, or a zip root as
input. We used to create IMAGES/ directory only when working with zip
root input. Commit 262bf3f0b5 has changed
to also stage boot / recovery images there when working with a zip file.
This CL makes sure the directory is always available under both modes.

Bug: 63456822
Test: zip -d target_files.zip IMAGES/\*;
      add_img_to_target_files.py target_files.zip
Test: sign_target_files_apks.py target_files.zip signed-target_files.zip
Change-Id: Iea91d0403cdec1b16bb93bb71d3ed06856b8f7c3
2017-11-20 12:44:18 -08:00
Tao Bao a0e521ed16 Merge "releasetools: Fix the rebuilding of vbmeta.img." am: 2f7fab9ab9 am: 4727930bff
am: 497862c757

Change-Id: I7bb84a65a9ef6e3d4bbe98244f51819b569ecbc9
2017-11-18 00:53:15 +00:00
Tao Bao 497862c757 Merge "releasetools: Fix the rebuilding of vbmeta.img." am: 2f7fab9ab9
am: 4727930bff

Change-Id: If73915a15fa675ca635588c99bc4e6ed56e4be05
2017-11-18 00:44:28 +00:00
Tao Bao 4727930bff Merge "releasetools: Fix the rebuilding of vbmeta.img."
am: 2f7fab9ab9

Change-Id: Ie6c6536be7da1e85167c22de36832b4145255f19
2017-11-18 00:32:23 +00:00
Tao Bao 2f7fab9ab9 Merge "releasetools: Fix the rebuilding of vbmeta.img." 2017-11-18 00:22:14 +00:00
Colin Cross a80df4238e Merge changes from topics "soong_logtags", "droiddoc_srcjars" am: f1f66974c6 am: 0b1fc880e5
am: 99dc51da38

Change-Id: I711c56f11c785ff7d2ccadbf912d96b6854c94b7
2017-11-17 21:48:22 +00:00
Colin Cross 99dc51da38 Merge changes from topics "soong_logtags", "droiddoc_srcjars" am: f1f66974c6
am: 0b1fc880e5

Change-Id: I7cc4970a5be00762c0127db0502ab03cbdfb13e7
2017-11-17 21:42:51 +00:00
Colin Cross 0b1fc880e5 Merge changes from topics "soong_logtags", "droiddoc_srcjars"
am: f1f66974c6

Change-Id: Ic47da3913b34da288c258d61540892427ddf4506
2017-11-17 21:36:51 +00:00
Colin Cross f1f66974c6 Merge changes from topics "soong_logtags", "droiddoc_srcjars"
* changes:
  Allow converting logtags to java without merged logtags file
  Add support for srcjars to droiddoc
2017-11-17 21:32:27 +00:00
Chih-hung Hsieh dfa1a5b3dc Merge "Recognize new clang-tidy android-* warnings." am: 315761ace1 am: dafe61c817
am: c982ae3728

Change-Id: Icbdb34606e0bcebf5733904fe20cbd50e52abecb
2017-11-17 17:19:07 +00:00
Chih-hung Hsieh c982ae3728 Merge "Recognize new clang-tidy android-* warnings." am: 315761ace1
am: dafe61c817

Change-Id: Iebf015a5351d46ba6331908c7a945fd661d1de6e
2017-11-17 17:16:58 +00:00
Chih-hung Hsieh dafe61c817 Merge "Recognize new clang-tidy android-* warnings."
am: 315761ace1

Change-Id: I516702a4bad35c6a4ec34f33bf42fa004400a860
2017-11-17 17:13:27 +00:00
Chih-Hung Hsieh 2cd467b36c Recognize new clang-tidy android-* warnings.
Test: warn.py build.log
Change-Id: I9bcd1fffcb567346a3d959f98821e2cf58e87ba2
2017-11-16 15:42:11 -08:00
Colin Cross 0bb782bd4e Allow converting logtags to java without merged logtags file
Most logtags files only have entries with hardcoded numbers.
Allow these files to be converted to java without needing the
merged logtags file.

Test: m checkbuild
Change-Id: I4cd38aa502fc9b8e50af92ff8296d3ad6abfb56e
2017-11-16 14:58:05 -08:00
Tomasz Wasilczyk ca4224fc7c Merge "Silence superfluous build messages." am: 4dbdb60698 am: a62800487e
am: 463dcf37f8

Change-Id: I69b560b725724152cf8fb87cf27d9c0d5c7c2e45
2017-11-15 22:42:25 +00:00
Tomasz Wasilczyk 463dcf37f8 Merge "Silence superfluous build messages." am: 4dbdb60698
am: a62800487e

Change-Id: I1c2f39812f1be01940887aed70c630f7e9b64a0f
2017-11-15 22:39:21 +00:00
Tomasz Wasilczyk a62800487e Merge "Silence superfluous build messages."
am: 4dbdb60698

Change-Id: I3574184c22b8fca41fd85e09ceacc2b598643c67
2017-11-15 22:35:48 +00:00
Tomasz Wasilczyk 4dbdb60698 Merge "Silence superfluous build messages." 2017-11-15 22:27:30 +00:00
Tao Bao 7cc46f8f40 Merge "releasetools: Fix the size check for AVB images." am: 905c84cada am: 029b3b6619
am: 29472b1848

Change-Id: I00ae52779aad8ef7ad4fdf874e13548776ec1ec3
2017-11-15 19:05:07 +00:00
Tao Bao 29472b1848 Merge "releasetools: Fix the size check for AVB images." am: 905c84cada
am: 029b3b6619

Change-Id: I60768378bfaa57fa47ad5a89d235a060d06e887c
2017-11-15 18:45:40 +00:00
Tomasz Wasilczyk 29ec06b7ba Silence superfluous build messages.
Bug: 69315492
Test: it builds
Change-Id: Ic02484b80fa27c53786204402930ed5f33ec7fda
2017-11-15 10:34:01 -08:00
Tao Bao 029b3b6619 Merge "releasetools: Fix the size check for AVB images."
am: 905c84cada

Change-Id: I4321bb226c8e77536fd0896980c64ac4ed680e37
2017-11-15 18:32:38 +00:00
Tao Bao 262bf3f0b5 releasetools: Fix the rebuilding of vbmeta.img.
If only vbmeta.img is missing from the target_files.zip,
'add_img_to_target_files.py -a' will fail to re-create vbmeta.img.

++++ vbmeta ++++

Traceback (most recent call last):
  File "./build/make/tools/releasetools/add_img_to_target_files.py", line 693, in <module>
    main(sys.argv[1:])
  File "./build/make/tools/releasetools/add_img_to_target_files.py", line 687, in main
    AddImagesToTargetFiles(args[0])
  File "./build/make/tools/releasetools/add_img_to_target_files.py", line 584, in AddImagesToTargetFiles
    boot_contents = boot_image.WriteToTemp()
AttributeError: 'NoneType' object has no attribute 'WriteToTemp'

Because it has skipped loading the boot.img, which leads to the above error.

Bug: 63456822
Test: As follows:
  $ zip -d target_files.zip vbmeta.img
  $ add_img_to_target_files.py -a target_files.zip
Test: `m dist` on aosp_arm64-userdebug
Change-Id: Ieba5f0b6848c3ec5d8bcfd24d48cc5af8b39f06c
2017-11-14 17:05:57 -08:00
Tao Bao 9dd909e6db releasetools: Fix the size check for AVB images.
When generating full OTAs for AVB-enabled targets, it fails the size
assertion for boot.img.

  ERROR: boot size (31457280) is 100.00% of limit (31457280)

The size assumption is no longer true for AVB-signed images, because
the actual image size should be always identical to the limit.

Bug: 67841177
Test: Enable AVB on bullhead. `m dist`.
Change-Id: I9bd432ccd88094628eb71308554839549eccb6d9
2017-11-14 15:43:36 -08:00
Tianjie Xu 15b728b8ed Merge "Add multithread support to call imgdiff with block-limit" am: 5d60cd2d3e am: 13680814dc
am: fd0011a9bb

Change-Id: Id3356c0511b8296181925598258655cedefd080a
2017-11-14 20:02:37 +00:00