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
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
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
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
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
Treehugger Robot
70a4f078b6
Merge "Pass --makefile_list to rbc board configuration" am: a95befe008
am: 975d03f73d
am: 4fc71bedb8
am: 9e643c59f9
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1975866
Change-Id: I8baeab6d9859529bd4ce3a4055857c20b3712d84
2022-02-08 21:11:41 +00:00
Treehugger Robot
9e643c59f9
Merge "Pass --makefile_list to rbc board configuration" am: a95befe008
am: 975d03f73d
am: 4fc71bedb8
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1975866
Change-Id: I221cebcf3193e8c94556a64e0ac47ee90cb09426
2022-02-08 21:00:12 +00:00
Treehugger Robot
4fc71bedb8
Merge "Pass --makefile_list to rbc board configuration" am: a95befe008
am: 975d03f73d
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1975866
Change-Id: I0edb0b0351855a5473f78a2e5d253002c5293fc6
2022-02-08 20:44:42 +00:00
Treehugger Robot
ac19dde301
[automerger skipped] Merge "Merge SQ1A.220205.002" am: ab26e67abc
am: d29d4ea39c
-s ours am: 6315b5dfbb
-s ours am: 54861a84e1
-s ours
...
am skip reason: Merged-In Ifcc54fbdb18bb480e73c2f52ebefd968b52a1e27 with SHA-1 fdbbcabca3
is already in history
Original change: https://android-review.googlesource.com/c/platform/build/+/1975694
Change-Id: I3397c1a0613d7ed5c8282a3bbf7cd14518d0c27e
2022-02-08 20:42: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
54861a84e1
[automerger skipped] Merge "Merge SQ1A.220205.002" am: ab26e67abc
am: d29d4ea39c
-s ours am: 6315b5dfbb
-s ours
...
am skip reason: Merged-In Ifcc54fbdb18bb480e73c2f52ebefd968b52a1e27 with SHA-1 fdbbcabca3
is already in history
Original change: https://android-review.googlesource.com/c/platform/build/+/1975694
Change-Id: Icbf2535fc30f9b624619bad85105a2ff4b370e57
2022-02-08 20:15:28 +00:00
Treehugger Robot
a95befe008
Merge "Pass --makefile_list to rbc board configuration"
2022-02-08 20:06:45 +00:00
Treehugger Robot
6315b5dfbb
[automerger skipped] Merge "Merge SQ1A.220205.002" am: ab26e67abc
am: d29d4ea39c
-s ours
...
am skip reason: Merged-In Ifcc54fbdb18bb480e73c2f52ebefd968b52a1e27 with SHA-1 fdbbcabca3
is already in history
Original change: https://android-review.googlesource.com/c/platform/build/+/1975694
Change-Id: I30b8549e669b8a60737ea93393068599a396e40e
2022-02-08 19:44:41 +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
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
Anton Hansson
e06a82cfd9
Merge "Fix typos in telephony_vendor product makefile" am: de88a91b43
am: 62b51f2e36
am: b2c6919f26
am: b683a82220
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1974425
Change-Id: I37405ffcb9fd236dd240409a74a85621df546581
2022-02-08 12:20:12 +00:00
Jooyung Han
fe4f1b5169
Merge "A custom APEX signing tool with --signing_args" am: 3a61599999
am: 82f355046c
am: 67e7bd664e
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1974282
Change-Id: I7e6ed2114e1710a25b6800fb6f6679794664d37b
2022-02-08 12:14:18 +00:00
Anton Hansson
b683a82220
Merge "Fix typos in telephony_vendor product makefile" am: de88a91b43
am: 62b51f2e36
am: b2c6919f26
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1974425
Change-Id: I3a13dac1a0bee09a594e1327db2f1cee60ae75a2
2022-02-08 12:04:57 +00:00
Jooyung Han
67e7bd664e
Merge "A custom APEX signing tool with --signing_args" am: 3a61599999
am: 82f355046c
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1974282
Change-Id: I88afad53771e60d5dcb3d56e8c5df09ec4a22f0f
2022-02-08 11:54:23 +00:00
Anton Hansson
b2c6919f26
Merge "Fix typos in telephony_vendor product makefile" am: de88a91b43
am: 62b51f2e36
...
Original change: https://android-review.googlesource.com/c/platform/build/+/1974425
Change-Id: I06b34f8c59e9194538c3f4c66cd79fad9fa908d6
2022-02-08 11:47:27 +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