Commit Graph

7575 Commits

Author SHA1 Message Date
Devin Moore
0edf9bf06c Merge "Get build.prop for init_boot.img from the ramdisk props" am: c3ee009f38 am: 192130b75e am: 605baddf83
Original change: https://android-review.googlesource.com/c/platform/build/+/1983226

Change-Id: I56b81e196e1f749e7b2a2c41d00c993cd4d8dcc2
2022-02-14 18:12:40 +00:00
Devin Moore
c3ee009f38 Merge "Get build.prop for init_boot.img from the ramdisk props" 2022-02-14 17:14:47 +00:00
Artur Satayev
e4814b895b Merge "Introduce ro.build.version.known_codenames sysprop." am: ac87c5e13a am: 206f023938 am: f20c233bad
Original change: https://android-review.googlesource.com/c/platform/build/+/1976678

Change-Id: I2360bda8d8cc85e759f7870dea0ef09753551f5d
2022-02-14 12:59:22 +00:00
Artur Satayev
ac87c5e13a Merge "Introduce ro.build.version.known_codenames sysprop." 2022-02-14 12:08:04 +00:00
Treehugger Robot
2fcee10b71 Merge "Support multiple library names per target." am: 5796849ac8 am: ba48b68251 am: 85f18c766c
Original change: https://android-review.googlesource.com/c/platform/build/+/1978111

Change-Id: I1620a0352071e3a760b477ac689a610d3743a9ad
2022-02-11 23:07:02 +00:00
Treehugger Robot
5796849ac8 Merge "Support multiple library names per target." 2022-02-11 22:17:17 +00:00
Devin Moore
b5195ff5fe Get build.prop for init_boot.img from the ramdisk props
boot.img and init_boot.img get their build properties from the platform
ramdisk properties.

Test: "m dist" then drop the OTA zip file into
android.github.io/analyseOTA to verify init_boot is present.
Bug: 211823573

Change-Id: I411e62bf0fc3cb49d4b12dadb52d9820fca041fa
2022-02-11 18:44:26 +00:00
satayev
2d94586cff Introduce ro.build.version.known_codenames sysprop.
It defines values for Build.VERSION.KNOWN_CODENAMES constant, and should
contain all codenames starting from Q, including current codename
for in development branches.

Bug: 211747008
Test: presubmit
Change-Id: If8995750e369ba39bfc7041580c21b2f96632a78
2022-02-11 13:20:49 +00:00
Treehugger Robot
dc04f552d5 Merge "Fix signing failure when no entry to convert to store" am: ea586a8d71 am: 8e9b39e061 am: 9c03d6a61e am: b3c67ad42e
Original change: https://android-review.googlesource.com/c/platform/build/+/1978755

Change-Id: I5a28c53819b7b7f99851cddb3ff0f7363c6c11d4
2022-02-10 13:57:06 +00:00
Treehugger Robot
ea586a8d71 Merge "Fix signing failure when no entry to convert to store" 2022-02-10 12:53:00 +00:00
Bob Badour
0a6ab27703 Merge "Greater-than zero is more idiomatic." am: 1848cef686 am: 7fda7d3641 am: 5f2ff8e600 am: 81ae2e8036
Original change: https://android-review.googlesource.com/c/platform/build/+/1978299

Change-Id: I021be628fb50fd11ed6f0775036c44949e9d3b5d
2022-02-10 11:03:51 +00:00
Bob Badour
1848cef686 Merge "Greater-than zero is more idiomatic." 2022-02-10 09:51:29 +00:00
Kelvin Zhang
c2ea9cec01 Merge "Support relative key path in VerifiedBootVersion2VerityImageBuilder" am: b69bcdec29 am: cdd4c44b43 am: e1c32a82ed am: 2199bf3cdc
Original change: https://android-review.googlesource.com/c/platform/build/+/1976677

Change-Id: I0b2e9b09d3fa0e798907d14902bcf88037f07b27
2022-02-10 05:42:47 +00:00
Kelvin Zhang
b69bcdec29 Merge "Support relative key path in VerifiedBootVersion2VerityImageBuilder" 2022-02-10 04:42:35 +00:00
Treehugger Robot
4cb64a50b6 Merge "Fix python3 errors: "TypeError: write() argument must be str, not bytes"" am: 955ee3712d am: 2e44a5303c am: 40e9d87fdf am: 68e1e13857
Original change: https://android-review.googlesource.com/c/platform/build/+/1977398

Change-Id: I5209aadac8bc3e85b8e1a7be20f7fe554237a79f
2022-02-10 00:33:32 +00:00
Kelvin Zhang
70876143b5 Fix signing failure when no entry to convert to store
zip -d doesn't work when no entry names specified. So if the list of
entry is empty, just skip calling zip -d.

Bug: 218438888

Test: th
Change-Id: Ie4419b9d6fdc2780255c6f12f9f4d35e5c0a7b26
2022-02-09 16:07:29 -08:00
Bob Badour
e9b38c175a Greater-than zero is more idiomatic.
Test: m all
Change-Id: I6000d937b98c84226a347b69c69b333a15beb355
2022-02-09 15:56:59 -08:00
Bob Badour
5028abccb5 Support multiple library names per target.
The prior interface to make supported only a single package name per
target; although, a target might have multiple licenses each with its
own package name.

Bug: 151177513
Bug: 210912771

Test: m all dist
Test: flash; About Phone -> Legal Information -> Third-party licenses
Change-Id: I5cf1964ec18af91ec7e258a1c6722527e3596cf3
2022-02-09 11:56:58 -08:00
Oleksiy Avramchenko
166d819fe4 Support relative key path in VerifiedBootVersion2VerityImageBuilder
Otatools archive can be unpacked to an arbitrary directory together
with bundled external/avb/test/data keys. Calling add_img_to_target_files
from a different directory fails to build an image which has
avb_{}_key_path pointing to the bundled key since add_hash_footer
can't find the key file.

Fix this by applying the same logic as in common.AppendAVBSigningArgs.

Steps to reproduce:
$ . build/envsetup.sh && lunch aosp_cf_arm64_phone-userdebug && make dist
$ cd out/dist && rm -rf otatools && unzip otatools.zip -d otatools
$ zip -d aosp_cf_arm64_phone-*target_files*.zip IMAGES/system_other.img
$ otatools/bin/add_img_to_target_files -a -v -p otatools \
    aosp_cf_arm64_phone-target_files-*.zip

Bug: 218531463
Test: manual, see "steps to reproduce" above
Change-Id: Id3f7cf2678e998ef1beda2b6741944c6455c2404
2022-02-09 19:47:18 +01:00
Iavor-Valentin Iftime
756b56125a Fix python3 errors: "TypeError: write() argument must be str, not bytes"
Bug: 186097910

Change-Id: I191c3230596026ee327c1403a6c72fbfa6fdb2d9
2022-02-09 16:02:33 +00:00
Treehugger Robot
c3c1130bbb Merge "system_dlkm: add to the non AB ota" am: 6daac9c78d am: 08b63fb8fb am: ae1f809dd8 am: c2e6419962
Original change: https://android-review.googlesource.com/c/platform/build/+/1978046

Change-Id: Ia9e5ae12048a9a4465f9ddb6a6b45b6c91b500e9
2022-02-09 07:26:16 +00:00
Treehugger Robot
6daac9c78d Merge "system_dlkm: add to the non AB ota" 2022-02-09 06:18:43 +00:00
Bob Badour
0a7a7e58f0 Merge "Add support for a product name as well as title." am: bcb81e74fe am: f3dce12e6b am: 75099787da am: be6023cf8d
Original change: https://android-review.googlesource.com/c/platform/build/+/1973030

Change-Id: I98f941ff116af36a79d05cbba879b8ac0a23d00f
2022-02-09 03:16:46 +00:00
Ramji Jiyani
7ecb0ec9f8 system_dlkm: add to the non AB ota
Test: TH
Bug: 200082547
Signed-off-by: Ramji Jiyani <ramjiyani@google.com>
Change-Id: Ib43ff411c17a96656a677e3a437e834884a0372f
2022-02-09 02:53:07 +00:00
Bob Badour
bcb81e74fe Merge "Add support for a product name as well as title." 2022-02-09 02:06:05 +00:00
Jooyung Han
1a7e955e50 Merge "A custom APEX signing tool with --signing_args" am: 3a61599999 am: 82f355046c am: 67e7bd664e am: fe4f1b5169
Original change: https://android-review.googlesource.com/c/platform/build/+/1974282

Change-Id: I946a3c8aba064f1bf1818e7ea3b0f125015f69f1
2022-02-08 12:32:55 +00:00
Jooyung Han
3a61599999 Merge "A custom APEX signing tool with --signing_args" 2022-02-08 11:23:24 +00:00
Treehugger Robot
dbd92551b1 Merge "Update APK parser to be compatible with new signer output" am: c438d9aaca am: e1c3dd402c am: be0f59ef69 am: 6065b59220
Original change: https://android-review.googlesource.com/c/platform/build/+/1976047

Change-Id: Ib6dd736f0bba43e2ad8876cefb65d80ba7c10f12
2022-02-08 05:40:56 +00:00
Treehugger Robot
3eea1f7c08 Merge "Fix small misuse of pass" am: f6cd3a1ddd am: 2238917d48 am: ad058b477b am: ae4ff2fa35
Original change: https://android-review.googlesource.com/c/platform/build/+/1976046

Change-Id: I5442f4b89666958c4af8bdd326732e6ca7fe63a1
2022-02-08 04:59:15 +00:00
Kelvin Zhang
846f285d55 Update APK parser to be compatible with new signer output
Test: th
Bug: 218304082
Change-Id: If79ffdb1e4cec192ef796a39dd0ed5b38bc430e0
2022-02-07 16:38:09 -08:00
Kelvin Zhang
9d021e996b Fix small misuse of pass
The intention is to skip current iteration of for loop, so 'continue'
should be used instead of 'pass'

Test: th
Change-Id: Ic955beeaef74100981b351e2e7807c7fde538783
2022-02-07 16:38:09 -08:00
Kelvin Zhang
aee09174c7 Merge "Store EROFS images uncompressed" am: 691f8b93c7 am: 828c68767e am: d5ab964e6b am: 59e5a9a114
Original change: https://android-review.googlesource.com/c/platform/build/+/1956494

Change-Id: I30657128360b0a1b3cfc014a49806ad56270a726
2022-02-07 22:08:06 +00:00
Kelvin Zhang
691f8b93c7 Merge "Store EROFS images uncompressed" 2022-02-07 20:55:51 +00:00
Jooyung Han
39259ec1a4 A custom APEX signing tool with --signing_args
apex_utils.SignApex() has `signing_args` argument which is supposed to
be passed to avbtool to set `--signing_helper` or
`--signing_helper_with_files`.

A custom APEX signing tool which relies on avbtool's signing should pass
the same arguments when signing_args is set.

This change passes signing_args verbatim to the custom APEX signing tool
via --signing_args argument.

Bug: 216971834
Test: tbd
Change-Id: I8aaec9440c4536e11e1e4a1dd4ae5f4fe32d4f23
2022-02-07 15:56:53 +09:00
Bob Badour
49dd4f75ff Add support for a product name as well as title.
Bug: 68860345
Bug: 151177513
Bug: 151953481
Bug: 213388645
Bug: 210912771

Test: m all
Test: m systemlicense
Test: m htmlnotice; out/soong/host/linux-x85/htmlnotice ...
Test: m textnotice; out/soong/host/linux-x85/textnotice ...
Test: m xmlnotice; out/soong/host/linux-x85/xmlnotice ...

where ... is the path to the .meta_lic file for the system image. In my
case if

$ export PRODUCT=$(realpath $ANDROID_PRODUCT_OUT --relative-to=$PWD)

... can be expressed as:

${PRODUCT}/gen/META/lic_intermediates/${PRODUCT}/system.img.meta_lic

Change-Id: Id5b2ebe3752081e3a89bba1d717cf103f7846043
2022-02-04 14:50:59 -08:00
Bob Badour
619a016423 Merge "Regularize command-line flags." am: 339edb60d2 am: 00e438dd74 am: 1dca1af739 am: 1c01e9b967
Original change: https://android-review.googlesource.com/c/platform/build/+/1969760

Change-Id: Ib492aaa8daa5a08bca1b5f3636494a4c0f83b598
2022-02-03 04:41:10 +00:00
Kelvin Zhang
4a63e8e3c5 Merge "Add zhangkelvin@ as owner for release tools scripts" am: 3b72e28421 am: 075084d909 am: b748ae9f86 am: 8489a72ede
Original change: https://android-review.googlesource.com/c/platform/build/+/1969479

Change-Id: Id71945739ce069c3ea9d288cf7efd568b9ebf8d8
2022-02-03 04:13:41 +00:00
Bob Badour
c5daefea03 Merge "license metadata xml notice files" am: a822469f2a am: ce5a9303ac am: 55c9a6b19c am: cb3bf880b7
Original change: https://android-review.googlesource.com/c/platform/build/+/1966147

Change-Id: I861b2220cfcf0754a255203c434413b43831260d
2022-02-03 04:13:32 +00:00
Bob Badour
339edb60d2 Merge "Regularize command-line flags." 2022-02-03 03:29:20 +00:00
Kelvin Zhang
3b72e28421 Merge "Add zhangkelvin@ as owner for release tools scripts" 2022-02-03 03:05:34 +00:00
Bob Badour
682e1bae57 Regularize command-line flags.
All the notice binaries have -title

All the binaries that can -stripPrefix can strip multiple.

Bug: 68860345
Bug: 151177513
Bug: 151953481
Bug: 213388645
Bug: 210912771

Test: m all
Test: m systemlicense
Test: m bom; out/soong/host/linux-x85/bom ...
Test: m dumpgraph; out/soong/host/linux-x85/dumpgraph ...
Test: m dumpresolutions; out/soong/host/linux-x85/dumpresolutions ...
Test: m htmlnotice; out/soong/host/linux-x85/htmlnotice ...
Test: m rtrace; out/soong/host/linux-x85/rtrace ...
Test: m textnotice; out/soong/host/linux-x85/textnotice ...
Test: m xmlnotice; out/soong/host/linux-x85/xmlnotice ...

where ... is the path to the .meta_lic file for the system image. In my
case if

$ export PRODUCT=$(realpath $ANDROID_PRODUCT_OUT --relative-to=$PWD)

... can be expressed as:

${PRODUCT}/gen/META/lic_intermediates/${PRODUCT}/system.img.meta_lic

Change-Id: I08357bf1adb048abba6563cf3cea6ee6d60405e0
2022-02-02 15:32:50 -08:00
Bob Badour
f87922450e license metadata xml notice files
Introduce the below command-line tool:

xmlnotice outputs a NOTICE.xml file constructed from the license
texts of the transitive closure of dependencies.

Bug: 68860345
Bug: 151177513
Bug: 151953481
Bug: 213388645
Bug: 210912771

Test: m all
Test: m systemlicense
Test: m xmlnotice; out/soong/host/linux-x85/xmlnotice ...

where ... is the path to the .meta_lic file for the system image. In my
case if

$ export PRODUCT=$(realpath $ANDROID_PRODUCT_OUT --relative-to=$PWD)

... can be expressed as:

${PRODUCT}/gen/META/lic_intermediates/${PRODUCT}/system.img.meta_lic

Change-Id: I267effd3a1c1b981bcdc5e058dce561a2d4a7948
2022-02-02 15:32:50 -08:00
Kelvin Zhang
834f5d458f Store EROFS images uncompressed
Test: th
Change-Id: I53005bee139079afe25da231ca1d42f03fa010a5
2022-02-02 12:52:34 -08:00
Kelvin Zhang
4f8f972a5b Add zhangkelvin@ as owner for release tools scripts
Change-Id: Ic861bc11d6a7d80c0d22a05ce35998753bb60752
2022-02-02 12:52:34 -08:00
Treehugger Robot
fead7b745f Merge "core & tools: system_dlkm: add dynamic partition" am: ef25de413e am: 0f5c34115c am: b4a4dee4c9 am: 144934f1fc
Original change: https://android-review.googlesource.com/c/platform/build/+/1963868

Change-Id: I122e7b631f692e9c5e05948e8fe25a24d4626f5d
2022-02-02 07:20:35 +00:00
Treehugger Robot
ef25de413e Merge "core & tools: system_dlkm: add dynamic partition" 2022-02-02 06:04:07 +00:00
Treehugger Robot
e116bf237b Merge "Add support for gzipping html output." am: 91e4f9db50 am: 7ceb15511b am: b41f62b0fe am: 73a854afe6
Original change: https://android-review.googlesource.com/c/platform/build/+/1966146

Change-Id: I0353ad51b2e24e5f3a4958935f03dcf4f16d05af
2022-02-02 05:50:28 +00:00
Bob Badour
608bdff0a7 Add support for gzipping html output.
Bug: 68860345
Bug: 151177513
Bug: 151953481
Bug: 213388645
Bug: 210912771

Test: m all
Test: m systemlicense
Test: m htmlnotice; out/soong/host/linux-x85/htmlnotice ...

where ... is -o=html.gz followed by the path to the .meta_lic file for
the system image. In my case if

$ export PRODUCT=$(realpath $ANDROID_PRODUCT_OUT --relative-to=$PWD)

the rest of ... can be expressed as:

${PRODUCT}/gen/META/lic_intermediates/${PRODUCT}/system.img.meta_lic

Change-Id: I7a42d5186876609a401956754e3dcff64211fb15
2022-02-01 15:35:40 -08:00
Treehugger Robot
2b0a4fd038 Merge changes I40a05866,Id3d6e701 am: 6ebf02914c am: b70dd510cc am: d7c4f72b58 am: 97c75469d2
Original change: https://android-review.googlesource.com/c/platform/build/+/1966104

Change-Id: Ic4b1350592fe49c6220b22bb3e5d16e9cf8ebda4
2022-02-01 02:30:50 +00:00
Treehugger Robot
6ebf02914c Merge changes I40a05866,Id3d6e701
* changes:
  license metadata reverse trace
  Fix copy+paste error.
2022-02-01 01:25:59 +00:00