Bob Badour
1848cef686
Merge "Greater-than zero is more idiomatic."
2022-02-10 09:51:29 +00:00
Treehugger Robot
f76bbe1ddb
Merge "Add an misc_info.txt entry to customize VABC compression" am: 3c84e5f114
am: a1e8783ffd
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1978746
Change-Id: Ia77f8027543d5216c8715bdc87a3a28cfdeac44e
2022-02-10 09:49:36 +00:00
Treehugger Robot
be2ac43515
[automerger skipped] Merge "Add missing LOCAL_ROTATION_MIN_SDK_VERSION" am: 901ee09c90
am: c9512971a9
am: d6d974ebcc
am: 256e3a38fb
-s ours
...
am skip reason: Merged-In I3b5e9bb3985c2ae83381499a44b339a7b1deb05c with SHA-1 a95ab436f6
is already in history
Original change: https://android-review.googlesource.com/c/platform/build/+/1977691
Change-Id: I2b6a0d1938b3f80b493de25785a329b0daf34b03
2022-02-10 09:49:29 +00:00
Treehugger Robot
a1e8783ffd
Merge "Add an misc_info.txt entry to customize VABC compression" am: 3c84e5f114
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1978746
Change-Id: I5c8da2a83a5d55cb55843bd0fd9fc2f7e0cb0097
2022-02-10 09:31:07 +00:00
Treehugger Robot
256e3a38fb
Merge "Add missing LOCAL_ROTATION_MIN_SDK_VERSION" am: 901ee09c90
am: c9512971a9
am: d6d974ebcc
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1977691
Change-Id: I033a596ae7a2f51fa885b0d9e8a0c7cea94bfff7
2022-02-10 09:28:13 +00:00
Treehugger Robot
3c84e5f114
Merge "Add an misc_info.txt entry to customize VABC compression"
2022-02-10 08:41:04 +00:00
Treehugger Robot
d6d974ebcc
Merge "Add missing LOCAL_ROTATION_MIN_SDK_VERSION" am: 901ee09c90
am: c9512971a9
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1977691
Change-Id: I7b0e1580e840494ad1a8c3a2048fc14a240446e7
2022-02-10 08:39:00 +00:00
Akilesh Kailash
fc0add48d8
Merge "Enable io_uring feature for virtual A/B OTA" am: 58588768aa
am: 6020b9e523
am: ff84fbeeb2
am: a89a0b4af6
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1977406
Change-Id: I22a28ef8c0511bb8a418f457d7714a53631c76bc
2022-02-10 08:32:55 +00:00
Treehugger Robot
c9512971a9
Merge "Add missing LOCAL_ROTATION_MIN_SDK_VERSION" am: 901ee09c90
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1977691
Change-Id: I9bad6bf57af54170623feb727d84a6728c6a3c4e
2022-02-10 08:26:01 +00:00
Akilesh Kailash
a89a0b4af6
Merge "Enable io_uring feature for virtual A/B OTA" am: 58588768aa
am: 6020b9e523
am: ff84fbeeb2
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1977406
Change-Id: Ie5b9c6bf30ff28fa7fadf75aafaee84eaf3953aa
2022-02-10 08:22:21 +00:00
yangbill
fa5026c4d8
Export runtime dependencies in module-info
...
This change exports the list of dependencies that are required by
modules at runtime. Note that only the host case is currently
handled.
Bug: 215243373
Test: m out/target/product/vsoc_x86_64/module-info.json
Change-Id: I05199c54da311e59c7ea87595397ee4eecfab6a3
2022-02-10 08:07:13 +00:00
Akilesh Kailash
ff84fbeeb2
Merge "Enable io_uring feature for virtual A/B OTA" am: 58588768aa
am: 6020b9e523
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1977406
Change-Id: I13b4f376c5b0bae3c02148f773c60d66fa261b94
2022-02-10 08:06:58 +00:00
Treehugger Robot
901ee09c90
Merge "Add missing LOCAL_ROTATION_MIN_SDK_VERSION"
2022-02-10 08:06:01 +00:00
yangbill
10adf32047
Add missing LOCAL_ROTATION_MIN_SDK_VERSION
...
This definition missing will cause merge conflict which is already in
main branch.
Bug: 215243373
Test: m out/target/product/vsoc_x86_64/module-info.json
Change-Id: Ifc103268aad9d6769822ff1eae4db1cc59aee57e
Merged-In: I3b5e9bb3985c2ae83381499a44b339a7b1deb05c
2022-02-10 08:05:06 +00:00
Akilesh Kailash
6020b9e523
Merge "Enable io_uring feature for virtual A/B OTA" am: 58588768aa
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1977406
Change-Id: I57e1bdd8cb03b5af2a369a49dd52f282f62dd1c0
2022-02-10 07:49:28 +00:00
Akilesh Kailash
58588768aa
Merge "Enable io_uring feature for virtual A/B OTA"
2022-02-10 07:35:42 +00:00
Bassem Khalife
41a3269dd6
Update Security String to 2022-04-05
...
Bug: 216579780
Change-Id: Ia4661819b2f7ad4cef86d026c97ce07c3be8e005
2022-02-10 06:19:50 +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
2199bf3cdc
Merge "Support relative key path in VerifiedBootVersion2VerityImageBuilder" am: b69bcdec29
am: cdd4c44b43
am: e1c32a82ed
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1976677
Change-Id: Ib6a25c7ea9a8d55a8afafc90eb92c0f7d84e6bec
2022-02-10 05:24:37 +00:00
Kelvin Zhang
e1c32a82ed
Merge "Support relative key path in VerifiedBootVersion2VerityImageBuilder" am: b69bcdec29
am: cdd4c44b43
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1976677
Change-Id: I9eadb6e37d4b7c4d2fc9dc53107655e9046b6e9f
2022-02-10 05:07:20 +00:00
Kelvin Zhang
cdd4c44b43
Merge "Support relative key path in VerifiedBootVersion2VerityImageBuilder" am: b69bcdec29
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1976677
Change-Id: I9cb8053980392cb659e882608d8fcd92e3f4061a
2022-02-10 04:55:12 +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
Treehugger Robot
68e1e13857
Merge "Fix python3 errors: "TypeError: write() argument must be str, not bytes"" am: 955ee3712d
am: 2e44a5303c
am: 40e9d87fdf
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1977398
Change-Id: I7464f81079946b99c9c3e98401c09fdd9f04018c
2022-02-10 00:19:24 +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
Treehugger Robot
40e9d87fdf
Merge "Fix python3 errors: "TypeError: write() argument must be str, not bytes"" am: 955ee3712d
am: 2e44a5303c
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1977398
Change-Id: I4eda515642b23b320d191500b609017d727b70da
2022-02-10 00:03:47 +00:00
Bob Badour
e9b38c175a
Greater-than zero is more idiomatic.
...
Test: m all
Change-Id: I6000d937b98c84226a347b69c69b333a15beb355
2022-02-09 15:56:59 -08:00
Treehugger Robot
2e44a5303c
Merge "Fix python3 errors: "TypeError: write() argument must be str, not bytes"" am: 955ee3712d
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1977398
Change-Id: I07d7bcfa7191408bdc23c4c893aae0c7e932d7cf
2022-02-09 23:51:39 +00:00
Treehugger Robot
955ee3712d
Merge "Fix python3 errors: "TypeError: write() argument must be str, not bytes""
2022-02-09 23:35:22 +00:00
Kelvin Zhang
fa91e98985
Add an misc_info.txt entry to customize VABC compression
...
Products can define PRODUCT_VIRTUAL_AB_COMPRESSION_METHOD
to specify the compression algorithm they prefer, or "none"
for no compression at all.
Test: th
Change-Id: I4fa27bd2c87b8f46c51023168d079e9b47ce2924
2022-02-09 14:23:16 -08:00
Will Burr
79626450f0
Merge "envsetup.sh: Update text in lunch menu for clarity" am: 44adfa7f8c
am: 0b828a50c7
am: c838e15827
am: 0bc5e16871
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1974422
Change-Id: I20ec8376a69d29454a5d365d9e45052cba5e7ddf
2022-02-09 20:37:03 +00:00
Will Burr
0bc5e16871
Merge "envsetup.sh: Update text in lunch menu for clarity" am: 44adfa7f8c
am: 0b828a50c7
am: c838e15827
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1974422
Change-Id: I6f2c3d6aa414773e6aa737800a886762801112cd
2022-02-09 20:22:05 +00:00
Will Burr
c838e15827
Merge "envsetup.sh: Update text in lunch menu for clarity" am: 44adfa7f8c
am: 0b828a50c7
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1974422
Change-Id: Ie126070d66e17ab04c5678899ae8a66ffa9d7546
2022-02-09 20:03:51 +00: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
Will Burr
0b828a50c7
Merge "envsetup.sh: Update text in lunch menu for clarity" am: 44adfa7f8c
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1974422
Change-Id: I5ed00a05afc69c1defa6e6c699ad74cef89934d4
2022-02-09 19:46:19 +00:00
Will Burr
44adfa7f8c
Merge "envsetup.sh: Update text in lunch menu for clarity"
2022-02-09 19:29:06 +00: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
Will Burr
404012020f
envsetup.sh: Update text in lunch menu for clarity
...
Updates the lunch menu text to make it clearer that the choices in lunch
menu are not fully comprehensive. As the list comes from common lunch
choices the text now refers to 'common combinations' and informs that
you can 'specify your own'. This should help developers who are unsure
why they cannot find their desired lunch target in the list.
Change-Id: Ib9d55ee46b7037c30a8f4b43fdd552ea66e887e8
Test: source build/envsetup.sh && lunch
2022-02-09 15:25:17 +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
c2e6419962
Merge "system_dlkm: add to the non AB ota" am: 6daac9c78d
am: 08b63fb8fb
am: ae1f809dd8
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1978046
Change-Id: Ifa172f7d48d3239b7b1f4ef66db61d562c201836
2022-02-09 07:08:21 +00:00
Treehugger Robot
ae1f809dd8
Merge "system_dlkm: add to the non AB ota" am: 6daac9c78d
am: 08b63fb8fb
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1978046
Change-Id: Ia270d9713b07b70311eeaccbe1f2ce3a0f64375d
2022-02-09 06:50:06 +00:00
Treehugger Robot
08b63fb8fb
Merge "system_dlkm: add to the non AB ota" am: 6daac9c78d
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1978046
Change-Id: Idc556765f087c0a7146df23a8039cde7c407cc69
2022-02-09 06:32:45 +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
Bob Badour
be6023cf8d
Merge "Add support for a product name as well as title." am: bcb81e74fe
am: f3dce12e6b
am: 75099787da
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1973030
Change-Id: I7446544d2dfdac2b39f5272aa09a0d6095dfeefd
2022-02-09 02:58:17 +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
75099787da
Merge "Add support for a product name as well as title." am: bcb81e74fe
am: f3dce12e6b
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1973030
Change-Id: I9e16b8736332007e2d4bcaafff32a8030cf958db
2022-02-09 02:41:17 +00:00
Bob Badour
f3dce12e6b
Merge "Add support for a product name as well as title." am: bcb81e74fe
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1973030
Change-Id: Ib30928db3aa1d7d4d84a4d79c07c6756cd04aa1d
2022-02-09 02:23:49 +00:00
Bob Badour
bcb81e74fe
Merge "Add support for a product name as well as title."
2022-02-09 02:06:05 +00:00