Commit Graph

100983 Commits

Author SHA1 Message Date
Kelvin Zhang
8bfe99c9f5 Fix missing signer arg error after re-generate OTA
sign_target_files_apks invokes ota_from_raw_img's main function directly(without creating a new process). As a result, flag overrides in  ota_from_raw_img impacts further signing. To fix, remove unnecessary flag overrides.

Test: th
Bug: 365697483
(cherry picked from https://android-review.googlesource.com/q/commit:c0ae029e87714d855ba438ecc38764f0b25a3a2a)
Merged-In: Iaf6ad4132afcab4912bd4b9ea002bfa3d9a1462a
Change-Id: Iaf6ad4132afcab4912bd4b9ea002bfa3d9a1462a
2024-09-16 21:49:00 +00:00
Kelvin Zhang
c07a0d1c44 Merge "Fix missing signer arg error after re-generate OTA" into main am: 0b181c9098 am: a877e85601
Original change: https://android-review.googlesource.com/c/platform/build/+/3269802

Change-Id: Ia35da1cab0cdbcd21c9e2a9318c0c1be2281b6ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-16 21:46:36 +00:00
Kelvin Zhang
a877e85601 Merge "Fix missing signer arg error after re-generate OTA" into main am: 0b181c9098
Original change: https://android-review.googlesource.com/c/platform/build/+/3269802

Change-Id: Iaf03748655fc8741fc0620a6b25cd6e547ebf9cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-16 21:27:44 +00:00
Kelvin Zhang
0b181c9098 Merge "Fix missing signer arg error after re-generate OTA" into main 2024-09-16 21:01:55 +00:00
Kelvin Zhang
c0ae029e87 Fix missing signer arg error after re-generate OTA
sign_target_files_apks invokes ota_from_raw_img's main function directly(without creating a new process). As a result, flag overrides in  ota_from_raw_img impacts further signing. To fix, remove unnecessary flag overrides.

Test: th
Bug: 365697483
Change-Id: Iaf6ad4132afcab4912bd4b9ea002bfa3d9a1462a
2024-09-16 21:01:45 +00:00
Treehugger Robot
ef48beb370 Merge "Don't show staged value if flag is RO" into main am: 112c4886c7 am: b51df30f56
Original change: https://android-review.googlesource.com/c/platform/build/+/3268192

Change-Id: Ic50b110179d79b1ca2fb9b3c8e64651cee7adb11
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-16 17:54:58 +00:00
Ronish Kalia
0f1cb1944e Merge "Update metadata target to the correct one" into main am: d79c96f7bf am: 2ed542a0b9
Original change: https://android-review.googlesource.com/c/platform/build/+/3267764

Change-Id: I7e874ea753b0ea32cdc6d74fd32b25d76f292ded
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-16 17:54:45 +00:00
Treehugger Robot
b51df30f56 Merge "Don't show staged value if flag is RO" into main am: 112c4886c7
Original change: https://android-review.googlesource.com/c/platform/build/+/3268192

Change-Id: Ib6ba91a642f719d603907adbe8c323582badec49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-16 17:54:11 +00:00
Marybeth Fair
ad3a183e02 Merge "Add ability to manually write to binary files." into main am: a323229292 am: 91b3cef7d1
Original change: https://android-review.googlesource.com/c/platform/build/+/3264236

Change-Id: If8b63c958389871df8c237c23bcab27d35978645
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-16 17:53:54 +00:00
Treehugger Robot
112c4886c7 Merge "Don't show staged value if flag is RO" into main 2024-09-16 16:58:33 +00:00
Ronish Kalia
2ed542a0b9 Merge "Update metadata target to the correct one" into main am: d79c96f7bf
Original change: https://android-review.googlesource.com/c/platform/build/+/3267764

Change-Id: I4d474a6d52c3b932d2eba1629a8976a6aee4c905
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-16 16:22:40 +00:00
Marybeth Fair
91b3cef7d1 Merge "Add ability to manually write to binary files." into main am: a323229292
Original change: https://android-review.googlesource.com/c/platform/build/+/3264236

Change-Id: I197770d016473b6ef2f5c7c9f9f3ae59dc0992b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-16 16:21:26 +00:00
Ronish Kalia
d79c96f7bf Merge "Update metadata target to the correct one" into main 2024-09-16 16:17:22 +00:00
Marybeth Fair
a323229292 Merge "Add ability to manually write to binary files." into main 2024-09-16 15:57:24 +00:00
Ted Bauer
431f44a314 Don't show staged value if flag is RO
Bug: 324436145
Change-Id: I493421f29d6e7f5e844dd47cc6417b3d5fe9cdbb
Test: m aflags && aflags list
2024-09-16 15:50:50 +00:00
Android Build Coastguard Worker
85e0efc049 Version bump to AP4A.240916.002 [core/build_id.mk]
Change-Id: I3db85c122f8464e1c896bd844a46084a7cd24e61
2024-09-16 14:50:23 +00:00
Marybeth Fair
45b0438cc0 Add ability to manually write to binary files.
I was updating the format of PackageTableHeader to add an additional
field (and due to that change incremented the file version). This broke
several tests under aconfig_storage_read_api and
aconfig_storage_write_api that were operating on files written in the
old schema. I tried to re-generate them using aconfig create-storage as
explained in aosp/2933375, but was having some trouble. Figure if we can
just update the files directly it will be easier to make updates in the
future anyway. This isn't bypassing logic that's tested - IIUC the tests
cover reading the file correctly (writing is covered in separate tests).

Usage:
$ aconfig-storage print --file=path/to/flag.map --type=flag_map
--format=json > flag_map.json
$ vim flag_map.json // Manually make updates
$ aconfig-storage write-bytes --input-file=flag_map.json
--output-file=path/to/flag.map --type=flag_map

Change-Id: I212bf0b97483740b30130eb121acb895d350da84
Test: manual (adding debug-only tooling) + cargo t
Bug: 316357686
2024-09-16 10:30:04 -04:00
Android Build Coastguard Worker
13fa082e60 Make change and version bump to AP4A.240916.001
Snap for 12370552 from ab5cf0d02d to 24Q4-release

Change-Id: I7617ccae873d8302de4165c19e8470ec0eba8e31
2024-09-15 21:45:16 +00:00
Android Build Coastguard Worker
42e87922b4 Make change and version bump to AP4A.240915.001
Snap for 12369952 from ab5cf0d02d to 24Q4-release

Change-Id: Ib92e151b025c642665879cd68d66eba658ba781a
2024-09-14 23:20:10 +00:00
Android Build Coastguard Worker
b38dffb13a Make change and version bump to AP4A.240914.001
Snap for 12368321 from 4bd215d9e0 to 24Q4-release

Change-Id: I03b356de86d4bd572d894a4de9f26e3479339065
2024-09-14 01:45:23 +00:00
Jeongik Cha
ab5cf0d02d Merge "Use Soong-defined system image's artifacts in target_files.zip" into main am: 5d7cbb6579 am: 01d8a58381
Original change: https://android-review.googlesource.com/c/platform/build/+/3261782

Change-Id: Ic5c21a00bba7786d7c7320d45e3948500c36ddf3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-14 00:11:48 +00:00
Jeongik Cha
01d8a58381 Merge "Use Soong-defined system image's artifacts in target_files.zip" into main am: 5d7cbb6579
Original change: https://android-review.googlesource.com/c/platform/build/+/3261782

Change-Id: I156dd0623f26d3af0951abb4d822ef674ef43405
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-13 23:44:44 +00:00
Ronish Kalia
f7c2fbef9f Update metadata target to the correct one
Bug: 326986729
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:3fb924d1eddfe031d799f34a2f32d39b9b671a44)
Merged-In: I3da3d31abd3280f85aad30f81151502ec32fc368
Change-Id: I3da3d31abd3280f85aad30f81151502ec32fc368
2024-09-13 23:38:46 +00:00
Jeongik Cha
5d7cbb6579 Merge "Use Soong-defined system image's artifacts in target_files.zip" into main 2024-09-13 23:29:12 +00:00
Luca Farsi
4bd215d9e0 Merge "Implement package_outputs in GeneralTestsOptimizer" into main am: 58923f2da8 am: 287619c4a3
Original change: https://android-review.googlesource.com/c/platform/build/+/3248582

Change-Id: Ifd6f7d3387a0991f1b33c03dfd871a8c40bbb062
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-13 21:01:42 +00:00
Luca Farsi
287619c4a3 Merge "Implement package_outputs in GeneralTestsOptimizer" into main am: 58923f2da8
Original change: https://android-review.googlesource.com/c/platform/build/+/3248582

Change-Id: I70ac5b55f64a397aa87988cb244b9dd839ea1710
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-13 20:43:40 +00:00
Luca Farsi
58923f2da8 Merge "Implement package_outputs in GeneralTestsOptimizer" into main 2024-09-13 20:24:38 +00:00
Ankur Bakshi
04ff86639e [automerger skipped] Update Security String to 2024-11-01 am: c40c0e4cec am: 4f91b596f8 am: 11e57867e0 am: 0769dc1dd3 am: 9350344f59 am: fc62caefdd am: 8e9b880e2c am: 4938353ef0 -s ours am: 54b89e75a9 -s ours am: a4de7bb7a3 -s ours am: 23af43d649 -s ours
am skip reason: Merged-In I689be7cc370e4b973d3ba8afc00350b18a4fc30a with SHA-1 c40c0e4cec is already in history

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

Change-Id: Ifa7ec1dc55db9efc4436320cb012830239a6f60b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-13 18:44:35 +00:00
Ankur Bakshi
da7e979305 [automerger skipped] Update Security String to 2024-11-01 am: c40c0e4cec am: 4f91b596f8 am: 11e57867e0 am: 0769dc1dd3 am: 9350344f59 am: fc62caefdd am: fe58bd40e9 am: 19927c34f6 am: 27191fa5ab am: 1f9a6f64ea -s ours
am skip reason: Merged-In I689be7cc370e4b973d3ba8afc00350b18a4fc30a with SHA-1 c40c0e4cec is already in history

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

Change-Id: Ia2d2fe7a4164aa746a9c5fc6e16d44d769804c76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-13 18:44:17 +00:00
Treehugger Robot
11aa3a17f9 Merge "Fix error in payload_signer_args passing" into main am: 703b4830dc am: 323c046d44
Original change: https://android-review.googlesource.com/c/platform/build/+/3267753

Change-Id: Ibd1987e27ba1e4a86bc4112866f880e004bd1590
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-13 18:43:33 +00:00
Treehugger Robot
323c046d44 Merge "Fix error in payload_signer_args passing" into main am: 703b4830dc
Original change: https://android-review.googlesource.com/c/platform/build/+/3267753

Change-Id: I3ed6d85a1f1199ecf891722609ecf5e17928b6f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-13 18:07:17 +00:00
Ankur Bakshi
23af43d649 [automerger skipped] Update Security String to 2024-11-01 am: c40c0e4cec am: 4f91b596f8 am: 11e57867e0 am: 0769dc1dd3 am: 9350344f59 am: fc62caefdd am: 8e9b880e2c am: 4938353ef0 -s ours am: 54b89e75a9 -s ours am: a4de7bb7a3 -s ours
am skip reason: Merged-In I689be7cc370e4b973d3ba8afc00350b18a4fc30a with SHA-1 c40c0e4cec is already in history

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

Change-Id: Ib63a7b8b79c0410b1574c5a25f1bf250cb01ab55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-13 17:54:16 +00:00
Ankur Bakshi
6c48135755 [automerger skipped] Update Security String to 2024-11-01 am: c40c0e4cec am: 4f91b596f8 am: 11e57867e0 am: 0769dc1dd3 am: 9350344f59 am: fc62caefdd am: 8e9b880e2c am: 4938353ef0 -s ours am: 54b89e75a9 -s ours am: 5f48f5528a -s ours
am skip reason: Merged-In I689be7cc370e4b973d3ba8afc00350b18a4fc30a with SHA-1 c40c0e4cec is already in history

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

Change-Id: Ibc66d634788eb1668f10a17837ad2c1584ea9582
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-13 17:54:12 +00:00
Ankur Bakshi
1f9a6f64ea Update Security String to 2024-11-01 am: c40c0e4cec am: 4f91b596f8 am: 11e57867e0 am: 0769dc1dd3 am: 9350344f59 am: fc62caefdd am: fe58bd40e9 am: 19927c34f6 am: 27191fa5ab
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/29355247

Change-Id: I9111bebd43f27dc7a80e59439d17f23c5eb4742c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-13 17:54:02 +00:00
Ankur Bakshi
c70cc16e35 [automerger skipped] Update Security String to 2024-11-01 am: c40c0e4cec am: 4f91b596f8 am: 11e57867e0 am: 0769dc1dd3 am: 9350344f59 am: fc62caefdd am: fe58bd40e9 am: 19927c34f6 am: 7478127af5 -s ours
am skip reason: Merged-In I9edc7171d124f0cfa540fea6f0e06ba877910444 with SHA-1 2666d4443b is already in history

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

Change-Id: Ib2b82958eef18de22eb232ef9fdd52ab45ca6929
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-13 17:53:54 +00:00
Treehugger Robot
703b4830dc Merge "Fix error in payload_signer_args passing" into main 2024-09-13 17:46:02 +00:00
Ankur Bakshi
a4de7bb7a3 [automerger skipped] Update Security String to 2024-11-01 am: c40c0e4cec am: 4f91b596f8 am: 11e57867e0 am: 0769dc1dd3 am: 9350344f59 am: fc62caefdd am: 8e9b880e2c am: 4938353ef0 -s ours am: 54b89e75a9 -s ours
am skip reason: Merged-In I689be7cc370e4b973d3ba8afc00350b18a4fc30a with SHA-1 c40c0e4cec is already in history

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

Change-Id: I392d9738e25a89cd443ea66ff1ee77bf06da841c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-13 17:36:36 +00:00
Ted Bauer
2c671f679f Merge "Show containers in list new storage" into main am: 0eb513b222 am: d33f812022
Original change: https://android-review.googlesource.com/c/platform/build/+/3266997

Change-Id: I6aad4a85c8fa26c24aafa22275036030ecd2a6c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-13 17:35:06 +00:00
Ankur Bakshi
5f48f5528a [automerger skipped] Update Security String to 2024-11-01 am: c40c0e4cec am: 4f91b596f8 am: 11e57867e0 am: 0769dc1dd3 am: 9350344f59 am: fc62caefdd am: 8e9b880e2c am: 4938353ef0 -s ours am: 54b89e75a9 -s ours
am skip reason: Merged-In I689be7cc370e4b973d3ba8afc00350b18a4fc30a with SHA-1 c40c0e4cec is already in history

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

Change-Id: Ie567710da1b33f5eb382cbc6bb7f15e497e8e7a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-13 17:32:42 +00:00
Ankur Bakshi
7478127af5 Update Security String to 2024-11-01 am: c40c0e4cec am: 4f91b596f8 am: 11e57867e0 am: 0769dc1dd3 am: 9350344f59 am: fc62caefdd am: fe58bd40e9 am: 19927c34f6
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/29355247

Change-Id: Ie2723aab4a6af52f17959480c02f60c818ba13c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-13 17:32:31 +00:00
Ankur Bakshi
54b89e75a9 [automerger skipped] Update Security String to 2024-11-01 am: c40c0e4cec am: 4f91b596f8 am: 11e57867e0 am: 0769dc1dd3 am: 9350344f59 am: fc62caefdd am: 8e9b880e2c am: 4938353ef0 -s ours
am skip reason: Merged-In I689be7cc370e4b973d3ba8afc00350b18a4fc30a with SHA-1 c40c0e4cec is already in history

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

Change-Id: I4abe66380aebd65f3b2b5ecacf41ffbe7ffe51ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-13 17:32:23 +00:00
Ankur Bakshi
27191fa5ab Update Security String to 2024-11-01 am: c40c0e4cec am: 4f91b596f8 am: 11e57867e0 am: 0769dc1dd3 am: 9350344f59 am: fc62caefdd am: fe58bd40e9 am: 19927c34f6
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/29355247

Change-Id: I1951a2a5d43f9a54ec2d353e8dd431903f47f05b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-13 17:32:14 +00:00
Treehugger Robot
11d7bc829b Merge "Allow mix of full and incremental updates in OTA" into main am: e1e07f892e am: 7a08b486df
Original change: https://android-review.googlesource.com/c/platform/build/+/3265835

Change-Id: If1a97898cd76b5ec9102e9ec99cefd07ec7df6bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-13 17:32:08 +00:00
Ted Bauer
d33f812022 Merge "Show containers in list new storage" into main am: 0eb513b222
Original change: https://android-review.googlesource.com/c/platform/build/+/3266997

Change-Id: Ib6d582ffa49b2a531b847c6a648b7f978b2597f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-13 17:17:07 +00:00
Treehugger Robot
7a08b486df Merge "Allow mix of full and incremental updates in OTA" into main am: e1e07f892e
Original change: https://android-review.googlesource.com/c/platform/build/+/3265835

Change-Id: I0fcc844e840ecac0e73824d2f483ad1138ca1258
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-13 17:14:19 +00:00
Ankur Bakshi
19927c34f6 Update Security String to 2024-11-01 am: c40c0e4cec am: 4f91b596f8 am: 11e57867e0 am: 0769dc1dd3 am: 9350344f59 am: fc62caefdd am: fe58bd40e9
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/29355247

Change-Id: Ib3fd0a537c180fcb0f02290e0baa0877d3867462
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-13 17:14:18 +00:00
Ankur Bakshi
4938353ef0 Update Security String to 2024-11-01 am: c40c0e4cec am: 4f91b596f8 am: 11e57867e0 am: 0769dc1dd3 am: 9350344f59 am: fc62caefdd am: 8e9b880e2c
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/29355247

Change-Id: I4843b00fefa0c7a888d78f5fe25b6dfd473c9595
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-13 17:13:50 +00:00
Ted Bauer
0eb513b222 Merge "Show containers in list new storage" into main 2024-09-13 17:13:13 +00:00
Ted Bauer
83d2a58dd9 Show containers in list new storage
Test: m
Bug: 324436145
Change-Id: I695aa130aee356451aa8196911d31b87d45d745d
2024-09-13 17:08:31 +00:00
Treehugger Robot
e1e07f892e Merge "Allow mix of full and incremental updates in OTA" into main 2024-09-13 16:56:44 +00:00