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

9978 Commits

Author SHA1 Message Date
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
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
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
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
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
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
703b4830dc Merge "Fix error in payload_signer_args passing" into main 2024-09-13 17:46:02 +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
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
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
Kelvin Zhang
e2b7599437 Fix error in payload_signer_args passing 
payload_signer_args is a list returned from shlex.split, need to unparse
it before passing to shell CLI

Test: th
Bug: 354019928
Change-Id: I4d308557b5bb808bf34c9d4514408c21176c81f6
 2024-09-13 16:53:33 +00:00
Dennis Shen
1760706461 Merge "Treat system_ext as system in container designation" into main am: 6940b7898d am: b0d8105009 
Original change: https://android-review.googlesource.com/c/platform/build/+/3261300

Change-Id: I2fa3f3306cd29b7d730020fd015930dfbc899f7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-13 02:20:12 +00:00
Kelvin Zhang
71565fb070 Allow mix of full and incremental updates in OTA 
This allows a subset of partitions to be updated in in full OTA fashion
when generating an incremental OTA. The benefit is faster OTA
generation(mostly for testing purposes).

Test: th
Bug: 365843325
Change-Id: Iff9f649c0646342eb9bdece9a46c942cb432b5e8
 2024-09-12 18:19:14 -07:00
Dennis Shen
b3681ad5c6 Treat system_ext as system in container designation 
Bug: b/365135457
Test: m
Change-Id: Iece264cdd49d84ef0e5acccdbcf68059c876395f
 2024-09-12 23:32:03 +00:00
Treehugger Robot
5bbf6701eb Merge "Expose DeviceProtos' paths to parse in Framework" into main am: 187e280d3c am: ebad1406dc 
Original change: https://android-review.googlesource.com/c/platform/build/+/3265027

Change-Id: I984b09f9f5c4c6045c66f81acc0b46197c4705dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-12 22:11:43 +00:00
Treehugger Robot
187e280d3c Merge "Expose DeviceProtos' paths to parse in Framework" into main 2024-09-12 21:33:17 +00:00
Treehugger Robot
905172ddc7 Merge "aconfig: Don't log matching validated flags" into main am: 1c0e255327 am: 8c56d035d1 
Original change: https://android-review.googlesource.com/c/platform/build/+/3262192

Change-Id: Ib907a88258c95d30a4f45cf359666e9e43e48138
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-12 17:01:20 +00:00
Treehugger Robot
1c0e255327 Merge "aconfig: Don't log matching validated flags" into main 2024-09-12 16:37:30 +00:00
Yurii Zubrytskyi
45e02d3c76 Expose DeviceProtos' paths to parse in Framework 
Framework currently hardcodes the paths to flags protos, with
this change it will be able to reuse the globally defined ones
and also gets access to all APEX flags

Bug: 301491148
Test: build + boot
Flag: EXEMPT build change
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:1e85e40c3ead83585ac3d7c71a712d35cd420a36)
Merged-In: I91dae72c32c47888697914265c90918389aa4c25
Change-Id: I91dae72c32c47888697914265c90918389aa4c25
 2024-09-12 05:53:21 +00:00
Kelvin Zhang
06b08b0369 Merge "Fix OTA package re-sign on release key servers" into main am: 278f34add3 am: 677627cbde 
Original change: https://android-review.googlesource.com/c/platform/build/+/3263774

Change-Id: I59690676ff534103add111dbca4885127f34baed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-12 00:24:23 +00:00
Kelvin Zhang
278f34add3 Merge "Fix OTA package re-sign on release key servers" into main 2024-09-12 00:09:00 +00:00
Jared Duke
f43413c53f aconfig: Don't log matching validated flags 
Avoid log spam by skipping log statements for matching validated flag
entries in the Java codegen. Also change any mismatched logs from
info to warning.

Change-Id: Icb8bba38d8594438757d76957c4c0188f6c2758a
Test: atest aconfig.test
Flag: EXEMPT bugfix
 2024-09-11 23:15:58 +00:00
Kelvin Zhang
4837944712 Fix OTA package re-sign on release key servers 
Release key signing passes more args than just --package_key, honor
these flags properly in signing script.

Test: th
Bug: 354019928
Change-Id: I49215e92f28da2ac4cd72fb9e5c6bbc94a3e3f02
 2024-09-11 16:07:04 -07:00
Treehugger Robot
13120197d4 Merge "Add flag for enabling only new storage and use in aflags" into main am: 44bebf7ccb am: aac4eae6d7 
Original change: https://android-review.googlesource.com/c/platform/build/+/3263578

Change-Id: I2abd3e20938f8701909f7047ee8911b1b102939a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-11 22:18:12 +00:00
Ted Bauer
b1edaae899 Add flag for enabling only new storage and use in aflags 
Change-Id: I73218de38d005d77987d5103364a102cec3abc07
Test: m && cargo t
Bug: 324436145
 2024-09-11 20:24:47 +00:00
Kelvin Zhang
db2a463588 Merge "Specify tooling dependency for create_brick_ota" into main am: e1f224cd4f am: f481291495 
Original change: https://android-review.googlesource.com/c/platform/build/+/3261046

Change-Id: I9ca7d13e276786dfebefe5bdd2f72f342ae9b816
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-10 23:12:46 +00:00
Kelvin Zhang
41d3833a07 Specify tooling dependency for create_brick_ota 
create_brick_ota relies on signapk for OTA package signing, hence
add relevant tools in dependency list.

Bug: 365701163

Change-Id: Ib414a468bc690ee35cc7cae7bc0d3062c89d0bbe
 2024-09-10 14:36:00 -07:00
Treehugger Robot
c7bdc727e1 Merge "Fix missing dir error for certain targets" into main am: f5a82529c2 am: 020ac6ea5c 
Original change: https://android-review.googlesource.com/c/platform/build/+/3260552

Change-Id: Icb9893f8661fd349f73984595fc6c75868af4fb9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-09 19:28:45 +00:00
Kelvin Zhang
2427d9d402 Fix missing dir error for certain targets 
Test: th
Bug: 364967828
Change-Id: I31f76533c3e3be63aa55f96be8fd697c4a629e65
 2024-09-09 11:14:53 -07:00
Xin Li
7c11265724 Merge "Merge 24Q3 to AOSP main" into main 2024-09-07 01:12:23 +00:00
Treehugger Robot
8017fc69f4 Merge "Create parent directories before writing to output target files" into main am: 611bbbc49d am: dd56dc161b 
Original change: https://android-review.googlesource.com/c/platform/build/+/3255204

Change-Id: I14579a5c9f3d6313883a45f5d93aa16723e49874
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-06 23:21:43 +00:00
Treehugger Robot
dd56dc161b Merge "Create parent directories before writing to output target files" into main am: 611bbbc49d 
Original change: https://android-review.googlesource.com/c/platform/build/+/3255204

Change-Id: Id58a0e5da52a5151e8f42c299a3390c3a28a5967
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-06 23:00:13 +00:00
Kelvin Zhang
cc758d9609 Create parent directories before writing to output target files 
Sometimes the output path's parent directory doesn't exist yet,
causing a failure in open() syscall.

Test: sign_target_files_apks solios-target_files-12328286.zip
solis_signed.zip
Bug: 364967828

Change-Id: I85f91ca5d1321c1ba763cac058eb28acc7f48e70
 2024-09-06 14:49:12 -07:00
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
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
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
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
Marybeth Fair
94b0ceee21 Merge "Add a function to fingerprint flag/offset info." into main am: 2610f480aa am: 27327f5586 
Original change: https://android-review.googlesource.com/c/platform/build/+/3249040

Change-Id: Ic90d38775eb96ad1d30578755868b43e60b0b104
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-04 15:58:22 +00:00
Marybeth Fair
27327f5586 Merge "Add a function to fingerprint flag/offset info." into main am: 2610f480aa 
Original change: https://android-review.googlesource.com/c/platform/build/+/3249040

Change-Id: I91bb4dd3a8e2f8105ffdc19264eb92bb9de22653
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-04 15:48:12 +00:00
Marybeth Fair
2610f480aa Merge "Add a function to fingerprint flag/offset info." into main 2024-09-04 15:37:59 +00:00