Commit graph

75565 commits

Author SHA1 Message Date
Treehugger Robot
8e9b39e061 Merge "Fix signing failure when no entry to convert to store" am: ea586a8d71
Original change: https://android-review.googlesource.com/c/platform/build/+/1978755

Change-Id: I1d311e6a5c0e4bf782d20ed4d00c2b138ac9bd49
2022-02-10 13:10:17 +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
7fda7d3641 Merge "Greater-than zero is more idiomatic." am: 1848cef686
Original change: https://android-review.googlesource.com/c/platform/build/+/1978299

Change-Id: I06406aa42a72c5278bbbeb636c1b3d958005ac23
2022-02-10 10:07:58 +00:00
Bob Badour
1848cef686 Merge "Greater-than zero is more idiomatic." 2022-02-10 09:51: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
3c84e5f114 Merge "Add an misc_info.txt entry to customize VABC compression" 2022-02-10 08:41:04 +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
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
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
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
Android Build Coastguard Worker
d43ab16bfa Version bump to SP2A.220305.011 [core/build_id.mk]
Change-Id: Iba5046b51ebd6fa0efdf0708e670c3a5d173c9df
2022-02-10 00:42:30 +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
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
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
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
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
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
Treehugger Robot
975d03f73d Merge "Pass --makefile_list to rbc board configuration" am: a95befe008
Original change: https://android-review.googlesource.com/c/platform/build/+/1975866

Change-Id: Ic36c1a3a1ae4dfbd126d31adb8c6e908ccd5444e
2022-02-08 20:28:04 +00:00
Treehugger Robot
a95befe008 Merge "Pass --makefile_list to rbc board configuration" 2022-02-08 20:06:45 +00:00
Akilesh Kailash
f72860ce18 Enable io_uring feature for virtual A/B OTA
snapuserd: Use io_uring READ/WRITE opcodes for snapshot merge.
Specifically, it is used only for readahead and ordered ops
code path.

    Snapshot merge perf:

    ===========================================================

    Incremental OTA of 300M between two git_master branches on Pixel 6:

    ===========================================================

    On Android S (with dm-snapshot): ~15 minutes:

    update_engine: [INFO:cleanup_previous_update_action.cc(330)] Merge finished with state MergeCompleted.
    update_engine: [INFO:cleanup_previous_update_action.cc(130)] Stopping/suspending/completing CleanupPreviousUpdateAction
    update_engine: [INFO:cleanup_previous_update_action.cc(501)] Reporting merge stats: MergeCompleted in 926508ms (resumed 0 times), using 0 bytes of COW image.

    ===========================================================

    On Android T (with io_uring: ~38 seconds):

    update_engine: [INFO:cleanup_previous_update_action.cc(330)] Merge finished with state MergeCompleted.
    update_engine: [INFO:cleanup_previous_update_action.cc(130)] Stopping/suspending/completing CleanupPreviousUpdateAction
    update_engine: [INFO:cleanup_previous_update_action.cc(501)] Reporting merge stats: MergeCompleted in 38868ms (resumed 0 times), using 0 bytes of COW image.

    ===========================================================

Bug: 202784286
Test: Full/Incremental OTA
Signed-off-by: Akilesh Kailash <akailash@google.com>
Change-Id: Ia6efff32898cdc6b683ca49c233ef45e8cd732e7
2022-02-08 20:00:39 +00:00
Treehugger Robot
d29d4ea39c Merge "Merge SQ1A.220205.002" am: ab26e67abc
Original change: https://android-review.googlesource.com/c/platform/build/+/1975694

Change-Id: Ia42acce006e4a24d66def976641573b36037f866
2022-02-08 19:12:25 +00:00
Treehugger Robot
ab26e67abc Merge "Merge SQ1A.220205.002" 2022-02-08 18:52:08 +00:00
Jooyung Han
82f355046c Merge "A custom APEX signing tool with --signing_args" am: 3a61599999
Original change: https://android-review.googlesource.com/c/platform/build/+/1974282

Change-Id: If2f0faac03ddb91e584789e95dec715335cd276b
2022-02-08 11:41:47 +00:00
Jooyung Han
3a61599999 Merge "A custom APEX signing tool with --signing_args" 2022-02-08 11:23:24 +00:00
Anton Hansson
62b51f2e36 Merge "Fix typos in telephony_vendor product makefile" am: de88a91b43
Original change: https://android-review.googlesource.com/c/platform/build/+/1974425

Change-Id: I15d9841a798641fbf1f394d2cb9761ae5c19e5bf
2022-02-08 10:35:29 +00:00
Anton Hansson
de88a91b43 Merge "Fix typos in telephony_vendor product makefile" 2022-02-08 09:43:31 +00:00
Xin Li
849ad3ba72 Merge SQ1A.220205.002
Bug: 213904741
Merged-In: Ifcc54fbdb18bb480e73c2f52ebefd968b52a1e27
Change-Id: I880096a3272bb9ae5b95e7f9b507b464b5aec856
2022-02-07 23:16:55 -08:00
Treehugger Robot
d836e794d6 Merge "Update default system Proguard config rules" am: 2624cfa2dc
Original change: https://android-review.googlesource.com/c/platform/build/+/1975127

Change-Id: Id53536d8000a6c2d04ad3c7a75c65662ef137c4d
2022-02-08 05:47:20 +00:00
Treehugger Robot
2624cfa2dc Merge "Update default system Proguard config rules" 2022-02-08 05:35:04 +00:00
Pirama Arumuga Nainar
1d88752712 Merge "Add GLOBAL_CLANG_EXTERNAL_CFLAGS_NO_OVERRIDE to third-party code" am: 9335286372
Original change: https://android-review.googlesource.com/c/platform/build/+/1973521

Change-Id: I110eea2accbff66026fdd98d53734859a6f57bee
2022-02-08 05:18:59 +00:00
Pirama Arumuga Nainar
9335286372 Merge "Add GLOBAL_CLANG_EXTERNAL_CFLAGS_NO_OVERRIDE to third-party code" 2022-02-08 05:01:59 +00:00
Treehugger Robot
e1c3dd402c Merge "Update APK parser to be compatible with new signer output" am: c438d9aaca
Original change: https://android-review.googlesource.com/c/platform/build/+/1976047

Change-Id: Ie32209d9d3d11cb4c48a9ed280edb570ada480cf
2022-02-08 04:43:46 +00:00
Treehugger Robot
c438d9aaca Merge "Update APK parser to be compatible with new signer output" 2022-02-08 04:25:02 +00:00
Treehugger Robot
2238917d48 Merge "Fix small misuse of pass" am: f6cd3a1ddd
Original change: https://android-review.googlesource.com/c/platform/build/+/1976046

Change-Id: I90547726772363a853bc5206093cf1f23ec2f030
2022-02-08 04:01:27 +00:00
Treehugger Robot
f6cd3a1ddd Merge "Fix small misuse of pass" 2022-02-08 03:42:12 +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