StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
100,465 Commits 1 Branch 0 Tags
1324f72d450200af54e4f68d7e21b29a7785ae9a
Commit Graph

100465 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Treehugger Robot
1324f72d45 Merge "Reland Support incremental dev option OTA during signing" into main am: 7f9092291f am: 7575a8174b 
Original change: https://android-review.googlesource.com/c/platform/build/+/3257139

Change-Id: Ie8b1e4c4a964549dbbc383921ec1e1a208fcc1ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-05 19:12:46 +00:00
Treehugger Robot
7575a8174b Merge "Reland Support incremental dev option OTA during signing" into main am: 7f9092291f 
Original change: https://android-review.googlesource.com/c/platform/build/+/3257139

Change-Id: I673212e73356136e88b2c64a40c094eddd2113f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-05 19:01:57 +00:00
Treehugger Robot
7f9092291f Merge "Reland Support incremental dev option OTA during signing" into main 2024-09-05 18:49:29 +00:00
Kelvin Zhang
065c5f5f5b Reland Support incremental dev option OTA during signing 
This allows incremental dev option to be used on release-key devices.
Boot images are signed during the signing process, and hence the dev
option OTAs(which are derivative of boot image) need to be re-generated.
Previously we only re-generate full OTAs, now we support incrementals
too.

Previous land of the CL had a bug where AddDtbo() is called even for
devices which do not have a DTBO partition, causing signing failures.
This reland fixes the issue above by checking "has_dtbo" in
misc_info.txt

Test: th
Bug: 339658378

This reverts commit 29c7842c02.

Change-Id: Ifb080aaa15faf752ab1cff687c54d00290c1bfa6
 2024-09-05 10:50:03 -07:00
Treehugger Robot
0f6cb74446 Merge "Fix str/bytes type error in ReplaceOtaKeys" into main am: f54075d5d4 am: baeab42b59 
Original change: https://android-review.googlesource.com/c/platform/build/+/3255473

Change-Id: I6320df87dc49791850eccc3cd61d6b39e8978e60
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-05 17:40:43 +00:00
Treehugger Robot
baeab42b59 Merge "Fix str/bytes type error in ReplaceOtaKeys" into main am: f54075d5d4 
Original change: https://android-review.googlesource.com/c/platform/build/+/3255473

Change-Id: Icd7a835359eaeee9d96d0c663e9a195dcce884ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-05 17:30:20 +00:00
Treehugger Robot
f54075d5d4 Merge "Fix str/bytes type error in ReplaceOtaKeys" into main 2024-09-05 17:27:48 +00:00
Joe Onorato
82012fa917 Merge "Add new script for metadata build target" into main am: 502175c0ad am: 0462cc589b 
Original change: https://android-review.googlesource.com/c/platform/build/+/3112939

Change-Id: I56a39b92d1e1a34687bc58eb09b89f44d265cdc4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-05 16:54:07 +00:00
Joe Onorato
0462cc589b Merge "Add new script for metadata build target" into main am: 502175c0ad 
Original change: https://android-review.googlesource.com/c/platform/build/+/3112939

Change-Id: I1171b175ea72e20e6dfc2ae064782318a53c6368
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-05 16:44:06 +00:00
Joe Onorato
502175c0ad Merge "Add new script for metadata build target" into main 2024-09-05 16:40:45 +00:00
Ziwei Zhang
8695f91343 [automerger skipped] Merge "RESTRICT AUTOMERGE: Package xTS console into CTS 14 to support MCTS." into android14-tests-dev am: 57fa0d3215 am: 88302705d5 am: f25ef1b114 am: 9613eac815 -s ours 
am skip reason: contains skip directive

Original change: https://android-review.googlesource.com/c/platform/build/+/3198230

Change-Id: I2599f0f4f01e361758f6573310d52bf86087f55d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-05 03:19:57 +00:00
Ziwei Zhang
82f0d108dc [automerger skipped] RESTRICT AUTOMERGE: Package xTS console into CTS 14 to support MCTS. am: 660e2ef531 am: 5e4f9a52a1 am: 97a005359b am: 860610472c -s ours 
am skip reason: contains skip directive

Original change: https://android-review.googlesource.com/c/platform/build/+/3198230

Change-Id: Ie870373dc81381c3dcedaca261b479cd5b578da4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-05 03:19:53 +00:00
Automerger Merge Worker
9667b04021 Merge changes from topic "am-80a90fc5b9e8408d87518054b3789e01" into main 
* changes:
  [automerger skipped] Merge "RESTRICT AUTOMERGE: Package xTS console into CTS 14 to support MCTS." into android14-tests-dev am: 57fa0d3215 am: 88302705d5 am: 04fe2d3b52 -s ours
  [automerger skipped] RESTRICT AUTOMERGE: Package xTS console into CTS 14 to support MCTS. am: 660e2ef531 am: 5e4f9a52a1 am: 94c28111d5 -s ours
 2024-09-05 03:08:13 +00:00
Ziwei Zhang
5e6538770d [automerger skipped] Merge "RESTRICT AUTOMERGE: Package xTS console into CTS 14 to support MCTS." into android14-tests-dev am: 57fa0d3215 am: 88302705d5 am: 04fe2d3b52 -s ours 
am skip reason: contains skip directive

Original change: https://android-review.googlesource.com/c/platform/build/+/3198230

Change-Id: I19e38c06a602aa87a37898d3fcb53b3b0d8b2435
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-05 03:08:04 +00:00
Ziwei Zhang
268c793016 [automerger skipped] RESTRICT AUTOMERGE: Package xTS console into CTS 14 to support MCTS. am: 660e2ef531 am: 5e4f9a52a1 am: 94c28111d5 -s ours 
am skip reason: contains skip directive

Original change: https://android-review.googlesource.com/c/platform/build/+/3198230

Change-Id: I4601e6b8db32641222a9f01e173bbfa97dd01517
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-05 03:07:57 +00:00
Automerger Merge Worker
21a7263578 Merge changes from topic "am-510e537a7c34466d8ed3053298cfa958" into main am: 84aefc948e am: 80c3e721b9 
Original change: https://android-review.googlesource.com/c/platform/build/+/3198230

Change-Id: Ic5dd215611839606aa77103dca52325a4cb7fedd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-05 03:07:56 +00:00
Ziwei Zhang
d62cea8d29 [automerger skipped] Merge "RESTRICT AUTOMERGE: Package xTS console into CTS 14 to support MCTS." into android14-tests-dev am: 57fa0d3215 -s ours am: 81d9588d4c -s ours am: bcdc8a9615 -s ours 
am skip reason: contains skip directive

Original change: https://android-review.googlesource.com/c/platform/build/+/3198230

Change-Id: Ie07d4ab87f85595537d326f47abcf7217e946401
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-05 03:07:53 +00:00
Ziwei Zhang
9613eac815 Merge "RESTRICT AUTOMERGE: Package xTS console into CTS 14 to support MCTS." into android14-tests-dev am: 57fa0d3215 am: 88302705d5 am: f25ef1b114 
Original change: https://android-review.googlesource.com/c/platform/build/+/3198230

Change-Id: Icd9f63fd85fb332700e715d29075c989986782b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-05 03:07:19 +00:00
Ziwei Zhang
860610472c RESTRICT AUTOMERGE: Package xTS console into CTS 14 to support MCTS. am: 660e2ef531 am: 5e4f9a52a1 am: 97a005359b 
Original change: https://android-review.googlesource.com/c/platform/build/+/3198230

Change-Id: Ie5bd1c67149f3443c3559e92430c6b1337027d9f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-05 03:07:13 +00:00
Automerger Merge Worker
03735ea13d Merge changes from topic "am-37a6674c47d345d5b8c04c1839d9e0dc" into android15-tests-dev am: ffc71467f0 am: 98bcae86d6 
Original change: https://android-review.googlesource.com/c/platform/build/+/3198230

Change-Id: If9c35d0bce9f13ebe80b7832eb76c0eb8c5b1fd0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-05 03:07:13 +00:00
Ziwei Zhang
81cbc6d4ae [automerger skipped] Merge "RESTRICT AUTOMERGE: Package xTS console into CTS 14 to support MCTS." into android14-tests-dev am: 57fa0d3215 -s ours am: 6032c5082b -s ours am: 23de46a4dd -s ours 
am skip reason: contains skip directive

Original change: https://android-review.googlesource.com/c/platform/build/+/3198230

Change-Id: Iba00cbd8479249b7f6a6090b6ca4311b5f05a229
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-05 03:07:08 +00:00
Automerger Merge Worker
80c3e721b9 Merge changes from topic "am-510e537a7c34466d8ed3053298cfa958" into main am: 84aefc948e 
Original change: https://android-review.googlesource.com/c/platform/build/+/3198230

Change-Id: Iaa8c952276cc1fb752bdfe1f4a0cba61a67ef08e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-05 02:57:12 +00:00
Ziwei Zhang
bcdc8a9615 [automerger skipped] Merge "RESTRICT AUTOMERGE: Package xTS console into CTS 14 to support MCTS." into android14-tests-dev am: 57fa0d3215 -s ours am: 81d9588d4c -s ours 
am skip reason: contains skip directive

Original change: https://android-review.googlesource.com/c/platform/build/+/3198230

Change-Id: Ie7603b90387d5c1a9672ee4d719bdbdbc476d654
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-05 02:57:07 +00:00
Ziwei Zhang
f25ef1b114 Merge "RESTRICT AUTOMERGE: Package xTS console into CTS 14 to support MCTS." into android14-tests-dev am: 57fa0d3215 am: 88302705d5 
Original change: https://android-review.googlesource.com/c/platform/build/+/3198230

Change-Id: I399baced32365465f17e1305ece024d2f8947167
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-05 02:56:59 +00:00
Ziwei Zhang
97a005359b RESTRICT AUTOMERGE: Package xTS console into CTS 14 to support MCTS. am: 660e2ef531 am: 5e4f9a52a1 
Original change: https://android-review.googlesource.com/c/platform/build/+/3198230

Change-Id: I500a77b4248074a623e5f150f50e9c57b18e1f83
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-05 02:56:54 +00:00
Automerger Merge Worker
98bcae86d6 Merge changes from topic "am-37a6674c47d345d5b8c04c1839d9e0dc" into android15-tests-dev am: ffc71467f0 
Original change: https://android-review.googlesource.com/c/platform/build/+/3198230

Change-Id: Ieda77ff6124ece43382b6f5c4231460eb1b82e03
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-05 02:56:43 +00:00
Ziwei Zhang
04fe2d3b52 Merge "RESTRICT AUTOMERGE: Package xTS console into CTS 14 to support MCTS." into android14-tests-dev am: 57fa0d3215 am: 88302705d5 
Original change: https://android-review.googlesource.com/c/platform/build/+/3198230

Change-Id: I84655cc58ea1c19a4ccd33e05287a638cdf39094
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-05 02:56:40 +00:00
Ziwei Zhang
23de46a4dd [automerger skipped] Merge "RESTRICT AUTOMERGE: Package xTS console into CTS 14 to support MCTS." into android14-tests-dev am: 57fa0d3215 -s ours am: 6032c5082b -s ours 
am skip reason: contains skip directive

Original change: https://android-review.googlesource.com/c/platform/build/+/3198230

Change-Id: Iff2d6b0c0f2b3ece8de3fb7436380b54db2cf9f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-05 02:56:40 +00:00
Ziwei Zhang
94c28111d5 RESTRICT AUTOMERGE: Package xTS console into CTS 14 to support MCTS. am: 660e2ef531 am: 5e4f9a52a1 
Original change: https://android-review.googlesource.com/c/platform/build/+/3198230

Change-Id: I1bc347b485af61746a4b32efaccfd4b29ce1ebad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-05 02:56:35 +00:00
Ziwei Zhang
88302705d5 Merge "RESTRICT AUTOMERGE: Package xTS console into CTS 14 to support MCTS." into android14-tests-dev am: 57fa0d3215 
Original change: https://android-review.googlesource.com/c/platform/build/+/3198230

Change-Id: I72c3ff27d4965f57d3b658eff39283f51f1b0cd9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-05 02:46:52 +00:00
Ziwei Zhang
5e4f9a52a1 RESTRICT AUTOMERGE: Package xTS console into CTS 14 to support MCTS. am: 660e2ef531 
Original change: https://android-review.googlesource.com/c/platform/build/+/3198230

Change-Id: Id6f0ba15c7dde54d0de284ac926ca4e4495419a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-05 02:46:47 +00:00
Automerger Merge Worker
ffc71467f0 Merge changes from topic "am-37a6674c47d345d5b8c04c1839d9e0dc" into android15-tests-dev 
* changes:
  [automerger skipped] Merge "RESTRICT AUTOMERGE: Package xTS console into CTS 14 to support MCTS." into android14-tests-dev am: 57fa0d3215 -s ours
  [automerger skipped] RESTRICT AUTOMERGE: Package xTS console into CTS 14 to support MCTS. am: 660e2ef531 -s ours
 2024-09-05 02:46:32 +00:00
Automerger Merge Worker
84aefc948e Merge changes from topic "am-510e537a7c34466d8ed3053298cfa958" into main 
* changes:
  [automerger skipped] Merge "RESTRICT AUTOMERGE: Package xTS console into CTS 14 to support MCTS." into android14-tests-dev am: 57fa0d3215 -s ours
  [automerger skipped] RESTRICT AUTOMERGE: Package xTS console into CTS 14 to support MCTS. am: 660e2ef531 -s ours
 2024-09-05 02:46:29 +00:00
Ziwei Zhang
6032c5082b [automerger skipped] Merge "RESTRICT AUTOMERGE: Package xTS console into CTS 14 to support MCTS." into android14-tests-dev am: 57fa0d3215 -s ours 
am skip reason: contains skip directive

Original change: https://android-review.googlesource.com/c/platform/build/+/3198230

Change-Id: I6bf9215c916aa8a674cfd3fab93d59aa48c26442
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-05 02:46:26 +00:00
Ziwei Zhang
74e51c4695 [automerger skipped] RESTRICT AUTOMERGE: Package xTS console into CTS 14 to support MCTS. am: 660e2ef531 -s ours 
am skip reason: contains skip directive

Original change: https://android-review.googlesource.com/c/platform/build/+/3198230

Change-Id: I9f882bb8119e3939c1996523b177712ac55b5a3c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-05 02:46:22 +00:00
Ziwei Zhang
81d9588d4c [automerger skipped] Merge "RESTRICT AUTOMERGE: Package xTS console into CTS 14 to support MCTS." into android14-tests-dev am: 57fa0d3215 -s ours 
am skip reason: contains skip directive

Original change: https://android-review.googlesource.com/c/platform/build/+/3198230

Change-Id: Ie9071e125b35e5fff308004e304af2a51330aa76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-05 02:46:20 +00:00
Ziwei Zhang
abbea01558 [automerger skipped] RESTRICT AUTOMERGE: Package xTS console into CTS 14 to support MCTS. am: 660e2ef531 -s ours 
am skip reason: contains skip directive

Original change: https://android-review.googlesource.com/c/platform/build/+/3198230

Change-Id: Idd6a52815413e3ef7b764db58c1d82bcf85c88cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-05 02:46:13 +00:00
Ziwei Zhang
57fa0d3215 Merge "RESTRICT AUTOMERGE: Package xTS console into CTS 14 to support MCTS." into android14-tests-dev 2024-09-05 02:41:06 +00:00
Xin Li
657b297ed8 Merge "Revert "Remove messaging package."" into main am: 444cd45ec7 am: c6809dc621 
Original change: https://android-review.googlesource.com/c/platform/build/+/3255457

Change-Id: Ia144d2b5e0e0938f97579dd832d63ebcf5ec40e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-05 00:43:02 +00:00
Xin Li
c6809dc621 Merge "Revert "Remove messaging package."" into main am: 444cd45ec7 
Original change: https://android-review.googlesource.com/c/platform/build/+/3255457

Change-Id: Icef65446c6443d7e71028996c40b4e3c88d9d9cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-05 00:33:14 +00:00
Xin Li
444cd45ec7 Merge "Revert "Remove messaging package."" into main 2024-09-05 00:23:44 +00:00
Kelvin Zhang
0c9a6ffb00 Fix str/bytes type error in ReplaceOtaKeys 
ZipFile.read() returns byte sequence, while re.match expects str.
Decode the bytes read first.

Test: th
Bug: 315855025
Change-Id: Id2da071f3caeab56cfac845a9e4f842c4e102f49
 2024-09-04 17:03:24 -07:00
Treehugger Robot
34bfd34905 Merge "Don't show container in list new storage" into main am: 9263e3e447 am: b7c2e20d68 
Original change: https://android-review.googlesource.com/c/platform/build/+/3255342

Change-Id: I99c8f126f0c14f2673f975780186d1fed3a41c45
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-04 19:42:39 +00:00
Treehugger Robot
b7c2e20d68 Merge "Don't show container in list new storage" into main am: 9263e3e447 
Original change: https://android-review.googlesource.com/c/platform/build/+/3255342

Change-Id: I9c0c9fbc85c70d081499be8d57f38a5dc9726b2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-04 19:33:23 +00:00
Treehugger Robot
9263e3e447 Merge "Don't show container in list new storage" into main 2024-09-04 19:24:25 +00:00
Ted Bauer
c50121613d Don't show container in list new storage 
Change-Id: I24263e244d5b86ef066cd2efd511a890b03bf6e7
Test: m
Bug: 324436145
 2024-09-04 18:11:59 +00:00
Colin Cross
01a9d7b58a Merge "Move checkbuild targets of Soong modules into Soong" into main am: d41d4149f6 am: e21cb30040 
Original change: https://android-review.googlesource.com/c/platform/build/+/3236363

Change-Id: Ia7ec264667a25cb68f566201a80ea7bd0b3a7614
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-04 17:24:17 +00:00
Colin Cross
e21cb30040 Merge "Move checkbuild targets of Soong modules into Soong" into main am: d41d4149f6 
Original change: https://android-review.googlesource.com/c/platform/build/+/3236363

Change-Id: I2940228144e026f91f2ef7dc8f4a2355450997b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-04 17:15:13 +00:00
Colin Cross
d41d4149f6 Merge "Move checkbuild targets of Soong modules into Soong" into main 2024-09-04 17:12:03 +00:00
Priyanka Advani (xWF)
3b6d8085f0 Revert "Remove messaging package." 
Revert submission 3241481-remove-messaging-package

Reason for revert: Droidmonitor created revert due to b/364617310, b/364626927, b/364617560

Reverted changes: /q/submissionid:3241481-remove-messaging-package

Change-Id: I64b5e27f19a46dddd9a6a8c20c6a09367d2a3c18
 2024-09-04 17:03:14 +00:00