Commit Graph

57955 Commits

Author SHA1 Message Date
Automerger Merge Worker 9d5134760c Merge "initial GKI boot.img support" am: 28a7820be2
Change-Id: I620304b97f0ab8f9f440aab1c5dc8e4fe18c4819
2020-03-05 00:43:36 +00:00
Treehugger Robot 28a7820be2 Merge "initial GKI boot.img support" 2020-03-05 00:31:27 +00:00
Automerger Merge Worker a78856cee6 Merge "Skip VNDK variant check on coverage builds." am: 791a8b5128
Change-Id: I506aac7d8dfe868ac123d7b68628e5e67864998e
2020-03-05 00:04:48 +00:00
Oliver Nguyen 791a8b5128 Merge "Skip VNDK variant check on coverage builds." 2020-03-04 23:55:32 +00:00
Steve Muckle 3363a0b8d6 initial GKI boot.img support
The GKI boot.img should be generated alongside the GSI. To make this
possible, define a flag (TARGET_NO_VENDOR_BOOT) that can be used to
disable the generation of the vendor_boot image.

Bug: 138323550
Change-Id: I91181853b26815e68a2fa2216b68579780d034dc
2020-03-04 10:54:56 -08:00
Automerger Merge Worker f39863dc7a Merge "Remove a redundant setting" am: a7f84831fe
Change-Id: I809890d3de6e5bc11a0a2feb0ced12774993fbb6
2020-03-04 06:25:18 +00:00
Treehugger Robot a7f84831fe Merge "Remove a redundant setting" 2020-03-04 06:15:11 +00:00
Automerger Merge Worker e0bab14d71 Merge "lunch: error on >1 arg (before ignored)" am: d567ea400a
Change-Id: Ia86a91acbb7101d1a45f4af636fd4c1c531374d9
2020-03-04 00:55:25 +00:00
Steven Moreland d567ea400a Merge "lunch: error on >1 arg (before ignored)" 2020-03-04 00:39:28 +00:00
Automerger Merge Worker 14b4bbc4a2 Merge "Uses a per-partition fingerprint for building images and avb_salt." am: b6145d320c
Change-Id: I8ca783cb0252a7b4562952835351aeef141913f9
2020-03-02 23:27:28 +00:00
Daniel Norman b6145d320c Merge "Uses a per-partition fingerprint for building images and avb_salt." 2020-03-02 22:29:50 +00:00
Daniel Norman d5fe862628 Uses a per-partition fingerprint for building images and avb_salt.
This causes the output image files of a merged build to be identical
to the image files of the input partial builds, for each images in
PARTITIONS_WITH_CARE_MAP.

Test: python -m unittest test_common
Test: `m dist`; `unzip out/dist/target_files.zip IMAGES/\*`;
      `zip -d out/dist/target_files.zip IMAGES/\*`
      `add_img_to_target_files -a out/dist/target_files.zip`.
      Verify that the rebuilt images are identical to the deleted ones.
Test: Build a merged target (using merge_target_files.py). Verify that
      the partial target-files.zip IMAGES are identical to the merged
      target-files.zip IMAGES for PARTITIONS_WITH_CARE_MAP images.
Bug: 150405807
Change-Id: I5fdf5783c1aff9c14cf5408090389b1f65b69ca6
2020-03-02 19:05:20 +00:00
TreeHugger Robot 098949fe60 Merge "DO NOT MERGE - Merge QQ2A.200305.003 into stage-aosp-master" into stage-aosp-master 2020-02-29 04:06:10 +00:00
Xin Li 51e18647ba DO NOT MERGE - Merge QQ2A.200305.003 into stage-aosp-master
Bug: 150410372
Change-Id: I09b3a138aa19a34400a7dfc8ef60dc52bae4c492
Merged-In: I89aaa622a1aa3a58cb6c35206be9244166f6ca84
2020-02-28 21:34:35 +00:00
Automerger Merge Worker 87f76601de Merge "Move build number file to out/soong" am: 47b08fbab5
Change-Id: I8561be9fcabc54526fbf5efa48ef32b08f025b96
2020-02-28 20:32:26 +00:00
Treehugger Robot 47b08fbab5 Merge "Move build number file to out/soong" 2020-02-28 20:15:52 +00:00
TreeHugger Robot 761a840a7f Merge "Skip QQ2A.200113.001 in stage-aosp-master" into stage-aosp-master 2020-02-28 05:58:29 +00:00
Automerger Merge Worker b68bc994e9 Merge "Separate html/csv output functions into html_writer.py" am: cabdab0a40
Change-Id: I6903764cfe04589866b380bab5d8825f7f1013e0
2020-02-28 01:41:00 +00:00
Chih-hung Hsieh cabdab0a40 Merge "Separate html/csv output functions into html_writer.py" 2020-02-28 01:30:12 +00:00
Chih-Hung Hsieh 3cce2bcc60 Separate html/csv output functions into html_writer.py
* also suppress some pylint warnings

Test: warn.py --url=http://cs/android --separator='?l=' build.log > warnings.html
Test: warn.py --gencsv build.log > warnings.csv
Change-Id: I497dbb7496ca21470ba33db03eedb27f5e8f1e96
2020-02-27 15:39:18 -08:00
Automerger Merge Worker 8ec17a7bcc Merge "Include LICENSE files, when available, in notices." am: 5167fb0a37
Change-Id: Iccf223694b8de22fa0e2d1be2a3dd93e8567fa21
2020-02-27 23:37:56 +00:00
Xin Li c6021f8f90 Skip QQ2A.200113.001 in stage-aosp-master
Bug: 146167222
Change-Id: I3f2d607c187847e9447df71c7233372aa2fdf2ac
2020-02-27 15:36:06 -08:00
Bob Badour 5167fb0a37 Merge "Include LICENSE files, when available, in notices." 2020-02-27 23:29:26 +00:00
Automerger Merge Worker 6ebc180650 Merge "Package vts-tradefed.jar in general-tests" am: 04c90d44f7
Change-Id: I674f8f399cc67c30c0dfd4fd129775045c5bed93
2020-02-27 22:26:13 +00:00
Treehugger Robot 04c90d44f7 Merge "Package vts-tradefed.jar in general-tests" 2020-02-27 22:17:19 +00:00
Automerger Merge Worker 7ca340fb91 Merge "Preserve the monotonic property when subtracting 0 block" am: 223d055768
Change-Id: I338d449372648cb49ec9d930cb5cda8cf9a9337d
2020-02-27 21:34:42 +00:00
Tianjie Xu 223d055768 Merge "Preserve the monotonic property when subtracting 0 block" 2020-02-27 21:22:23 +00:00
Bob Badour 9da828c1b4 Include LICENSE files, when available, in notices.
As a first step to removing the go/android3p instructions to copy or
to link NOTICE to LICENSE, include LICENSE files in the notices, which
will allow deleting all of the copied/linked NOTICE files.

The change causes a couple minor additions to the system image notice
files.

Test: manually built and compared before and after notices

Change-Id: Id23cae4a8f2d103e1379f4341340fc56c5943dc2
2020-02-27 19:19:23 +00:00
Automerger Merge Worker 2150099d65 Merge "Partition the targets for notice files." am: 684350d24f
Change-Id: If17662be626c33c9b7f9ca3c742f58fb76d0492e
2020-02-27 15:31:10 +00:00
Treehugger Robot 684350d24f Merge "Partition the targets for notice files." 2020-02-27 15:17:08 +00:00
Automerger Merge Worker 74272124df Merge "Recognize more warning patterns." am: ef7f5467e9
Change-Id: I3c763a22355cc53e75006c59a2276489b55989ad
2020-02-27 08:23:18 +00:00
Chih-hung Hsieh ef7f5467e9 Merge "Recognize more warning patterns." 2020-02-27 08:09:55 +00:00
Automerger Merge Worker 03e36c8acc Merge "Revert "Set up IRadioConfig 1.3"" am: 817e013a00
Change-Id: Ie6ce31dd011ca2b82e4a1b723d3db7dc18bfdc3e
2020-02-27 06:05:42 +00:00
Tianjie Xu f02ececc7f Preserve the monotonic property when subtracting 0 block
The monotonic property of the range is lost after the recent change to
subtract 0th block from the file range. As a result, we read the block
in the wrong order when pull files from the raw image. This yields a
incorrect hash during validation.

Bug: 150334561
Test: run validate_target_file. unittests
Change-Id: Id4fedaaf273c42c8d21a4549fda4c9a45e22066a
2020-02-26 21:50:47 -08:00
Sarah Chin 817e013a00 Merge "Revert "Set up IRadioConfig 1.3"" 2020-02-27 05:46:08 +00:00
Bob Badour 4b25c90e52 Partition the targets for notice files.
Partition the targets into those appearing in system images, those
appearing somewhere unreadable by the Settings UI, whose notices
must appear in a readable system image, and those not appearing
on the device thus not needing notices. Assert no other targets
appear under $(PRODUCT_OUT).

Test: manually built and tested phone image

Change-Id: If82cb36f98f8e6066d1c67bb4d15976be433d403
2020-02-26 16:49:28 -08:00
Chih-Hung Hsieh 445ad810c8 Recognize more warning patterns.
* add more Java, Kotlin, and Rust warning patterns
* recognize more clang-tidy cert-* and bugprone-* warnings;
  still keep the catch-all 'cert' and 'bugprone' groups.

Test: warn.py build.log > warnings.html
Change-Id: I909ec09822f42f60493ebe943c055bf0d4b69938
2020-02-26 14:34:21 -08:00
Automerger Merge Worker 3bcf176437 Merge "Use same warn_common.py and warn.py for Android and Chrome" am: 3728312005
Change-Id: I226ac67bfd3fd7548b325b7a5f1c3aa2f8da9148
2020-02-26 18:36:39 +00:00
Chih-hung Hsieh 3728312005 Merge "Use same warn_common.py and warn.py for Android and Chrome" 2020-02-26 18:19:15 +00:00
Automerger Merge Worker bc2383c481 Merge "Revert "Create telephony apex."" am: 71b4252b20
Change-Id: I514f180126c53ac750ebef4f36b9ffc4ef65382f
2020-02-26 18:14:07 +00:00
Amit Mahajan 71b4252b20 Merge "Revert "Create telephony apex."" 2020-02-26 18:01:30 +00:00
Chih-Hung Hsieh 5ae5519661 Use same warn_common.py and warn.py for Android and Chrome
* add chrome_project_list.py
* use newer Chrome's warn_common.py and severity.py
* modify warn_common.py to work with both python2 and python3,
  to work with and without google3

Test: warn.py --url=http://cs/android --separator='?l=' build.log > warnings.html
Test: warn.py --gencsv build.log > warnings.csv
Change-Id: I9aeee7031c11988d8ead1733ff4846ae6cb1ee73
2020-02-25 19:47:35 -08:00
Steven Moreland 92793dc56c lunch: error on >1 arg (before ignored)
Bug: N/A
Test: lunch w/ 0, 1, and 2 args
Change-Id: Icbeb511e836b08cbd64b08a23b0e4820039b12ab
2020-02-25 18:33:53 -08:00
Amit Mahajan ce7c9a70bd Revert "Create telephony apex."
This reverts commit 8c7ca1bc05.

Reason for revert: b/148821604

Merged-in: I12defd7fe6aba01a381f8ad014475941e58d21d3
Change-Id: I12defd7fe6aba01a381f8ad014475941e58d21d3
2020-02-26 00:46:14 +00:00
Automerger Merge Worker 33c9bd38da Merge "Support removing AVB public keys" am: b5aad1b937
Change-Id: Id96c2d48b5ea4f5b63e09970d8139433bae042aa
2020-02-26 00:17:47 +00:00
Treehugger Robot b5aad1b937 Merge "Support removing AVB public keys" 2020-02-26 00:09:17 +00:00
Sarah Chin bd1fd8eb32 Revert "Set up IRadioConfig 1.3"
This reverts commit 86167418b7.

Reason for revert: Change will not be supported by vendor, so HAL for RadioConfig is no longer necessary.

Change-Id: Iea50dcf86076a72b16276496410e8a658e9a7ce5
Merged-In: Ifc3323584a01a8636d4cf30da37d29b297252d26
2020-02-25 00:52:44 +00:00
Colin Cross d68a88402f Move build number file to out/soong
Move the build number file to out/soong so Soong can treat it
as an output path, and pass the name of the file to Soong instead
of the command to read it.

Test: m checkbuild
Change-Id: I9e1aecf33d11fe4fde34cd57cc9b1f1ad49b0424
2020-02-25 00:06:46 +00:00
Oliver Nguyen 4a4c834b09 Skip VNDK variant check on coverage builds.
Coverage builds result in different core and vendor variants due to
different coverage metadata from static libraries. Skip this check only
on coverage builds.

Bug: 143977934
Test: m CLANG_COVERAGE=true COVERAGE_PATHS='*'
Change-Id: I906745e951b36a87cedf998a93bdc390196a606e
2020-02-24 15:18:45 -08:00
Bowgo Tsai 2fe786a528 Support removing AVB public keys
AVB public keys might be installed into the first-stage ramdisk.
This CL supports removing some AVB keys during the signing process,
which can be useful when a key needs to be revoked.

Also correcting the path of force_debuggable detection.

Bug: 150109393
Test: make dist
Test: ./build/tools/releasetools/sign_target_files_apks \
      --remove_avb_public_keys key1.avbpubkey,key2.avbpubkey \
      out/dist/*-target_files-*.zip signed-target_files.zip
Change-Id: I1af95adbbec655f40121f3392965dd1950aca4e5
2020-02-24 17:53:10 +08:00