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

9941 Commits

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
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
Marybeth Fair
df1b7d1d81 Add a function to fingerprint flag/offset info. 
Uses SipHasher implementation added to the project. Ideally the output
would remain consistent between builds (though the worst case of an
updated algorithm would be a string lookup for cross-container reads
only).

Sort the flags first so everything is always added to the hasher in the
same order - note this code is only run at build time, not runtime.

Next step is to write this fingerprint into the package.map file and
introduce a flag to guard this change.

Bug: 316357686
Test: atest aconfig.test
Change-Id: Ie5f34541d982dfa120ffb05fc0790603689d47c0
 2024-09-03 16:24:51 -04:00
Treehugger Robot
24b45be9a0 Merge "aconfig: Use LazyLock rather than lazy_static" into main am: 36a352cd02 am: 364dca6ca5 
Original change: https://android-review.googlesource.com/c/platform/build/+/3252494

Change-Id: Idd38abe84a61b4ab55b13d625df6c1d8c0433abb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-03 17:12:35 +00:00
Treehugger Robot
364dca6ca5 Merge "aconfig: Use LazyLock rather than lazy_static" into main am: 36a352cd02 
Original change: https://android-review.googlesource.com/c/platform/build/+/3252494

Change-Id: I94320dad1867cb3c49c4e446365fb4de4634be5e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-03 17:00:07 +00:00
Treehugger Robot
36a352cd02 Merge "aconfig: Use LazyLock rather than lazy_static" into main 2024-09-03 16:56:06 +00:00
Andrew Walbran
d3878575ac aconfig: Use LazyLock rather than lazy_static 
Now that we have Rust 1.80 LazyLock is available in the standard library
so we no longer need to use external crates such as lazy_static.

Bug: 364211748
Test: atest aconfig.test
Test: atest aconfig.prod_mode.test.rust
Test: atest aconfig.test_mode.test.rust
Test: atest aconfig.force_read_only_mode.test.rust
Change-Id: If2862eaf20065c118daa9fc51e9fb403b99dada3
 2024-09-03 17:01:49 +01:00
Treehugger Robot
ed0459645f Merge "java reader reads directly from map" into main am: 9f254c6b5d am: f4565686e4 
Original change: https://android-review.googlesource.com/c/platform/build/+/3251572

Change-Id: I334ca9039f83bfe1e0a3838c5492af6e11f0423f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-30 21:23:21 +00:00
Treehugger Robot
f4565686e4 Merge "java reader reads directly from map" into main am: 9f254c6b5d 
Original change: https://android-review.googlesource.com/c/platform/build/+/3251572

Change-Id: I9e3d941414a961bbce2f5ef507bb77f8b37536b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-30 21:14:05 +00:00
Zhi Dou
9c85770aa4 java reader reads directly from map 
This commit changes java reader to directly read the flag value from the
map file instead of load the entire file.

Change-Id: Icee42d99506894da1e3e32a31c6554895719de7b
Test: atest aconfig_storage_read_api.test.java aconfig_storage_file.test.java
Bug: 352078117
 2024-08-30 18:49:07 +00:00
Pechetty Sravani (xWF)
d75f037ac7 Merge "Revert "Support incremental dev option OTA during signing"" into main am: dbba064366 am: ad531c35b0 
Original change: https://android-review.googlesource.com/c/platform/build/+/3250456

Change-Id: I9b5ae746f8dc07f7c43b76727c4cb24c9fe4d9aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-30 07:39:03 +00:00
Pechetty Sravani (xWF)
ad531c35b0 Merge "Revert "Support incremental dev option OTA during signing"" into main am: dbba064366 
Original change: https://android-review.googlesource.com/c/platform/build/+/3250456

Change-Id: Iee71e26a88b5d29d9df8115cd7beae18673cbdff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-30 07:28:31 +00:00
Priyanka Advani (xWF)
29c7842c02 Revert "Support incremental dev option OTA during signing" 
This reverts commit 5fcaa1f635.

Reason for revert: Droidmonitor created revert due to b/363090380.

Change-Id: I366b12a303190f73e6ac16a1fcff83b1e16ebf2d
 2024-08-30 00:33:08 +00:00
Steven Moreland
faee762e96 Merge "Support incremental dev option OTA during signing" into main am: 4713911b81 am: 0b78a4cfd8 
Original change: https://android-review.googlesource.com/c/platform/build/+/3236459

Change-Id: I5df2d6a2d4e7eb09da6df0d6635ff481c58bc9ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-29 23:46:53 +00:00
Steven Moreland
0b78a4cfd8 Merge "Support incremental dev option OTA during signing" into main am: 4713911b81 
Original change: https://android-review.googlesource.com/c/platform/build/+/3236459

Change-Id: I1dde20dc24eefe6987632e2f92b496c6ae7d4ab8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-29 23:39:20 +00:00
Kelvin Zhang
5fcaa1f635 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.

Test: th
Bug: 339658378
Change-Id: I4755379b49ff8adf351ccaf76fe38f19c1685e9e
 2024-08-29 13:38:45 -07:00
Treehugger Robot
2238d5b835 Merge "aconfig Rust: Support huge list of flags" into main am: d713353ab8 am: 0a79e2158c 
Original change: https://android-review.googlesource.com/c/platform/build/+/3247857

Change-Id: I2ad9121ab5b8495cd9c4aec7182548b06140bf06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-29 14:57:31 +00:00
Treehugger Robot
0a79e2158c Merge "aconfig Rust: Support huge list of flags" into main am: d713353ab8 
Original change: https://android-review.googlesource.com/c/platform/build/+/3247857

Change-Id: I679d7a46f43f3b00cd7792744a3552bd6a65ce8e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-29 14:49:26 +00:00
Treehugger Robot
d713353ab8 Merge "aconfig Rust: Support huge list of flags" into main 2024-08-29 14:46:45 +00:00
William Escande
a8454c30ed aconfig Rust: Support huge list of flags 
Test: m libbluetooth_aconfig_flags_rust
Test: atest aconfig.prod_mode.test.rust
Test: atest aconfig.test_mode.test.rust
Test: atest aconfig.force_read_only_mode.test.rust
Test: atest aconfig.test
Bug: 311772251
Bug: 362773105
Change-Id: I48e268fc783e491a045d1bb6298c2b3c87045722
 2024-08-28 16:52:56 -07:00
Treehugger Robot
4279d6b731 Merge "Implement SipHasher" into main am: d53df1b115 am: 11d717cd22 
Original change: https://android-review.googlesource.com/c/platform/build/+/3243780

Change-Id: I3356c0d100a86464b3af884f93c6a9e612bc61ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-28 17:53:43 +00:00
Treehugger Robot
11d717cd22 Merge "Implement SipHasher" into main am: d53df1b115 
Original change: https://android-review.googlesource.com/c/platform/build/+/3243780

Change-Id: I5917a9b03103b335c2b6d6468f18365d12c7d6ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-28 17:45:51 +00:00
Treehugger Robot
d53df1b115 Merge "Implement SipHasher" into main 2024-08-28 17:34:42 +00:00
Treehugger Robot
6933f70b5a Merge "Update diff allowlist for soong system image build" into main am: 53c4ec42ad am: 39603ad5c5 
Original change: https://android-review.googlesource.com/c/platform/build/+/3241532

Change-Id: I5a9f827e61cd48c9af5e783614c1ac9e8640435b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-28 17:26:14 +00:00
Treehugger Robot
39603ad5c5 Merge "Update diff allowlist for soong system image build" into main am: 53c4ec42ad 
Original change: https://android-review.googlesource.com/c/platform/build/+/3241532

Change-Id: Ia3b78cb0f99afe17c9cd1be80d76a48ed2ea7251
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-28 17:24:20 +00:00
Zhi Dou
bca30dd13f Implement SipHasher 
This change implements SipHasher in rust and java to make sure same
bytes array will be hashed into the same u64.

The implementation is needed, thus when rust, and java code read the
same flag file, they can find the same entry based on the same key.

Test: atest aconfig_storage_file.test.java aconfig_storage_file.test.cpp
Bug: 352078117
Change-Id: I2ce470039213a09a1df7637e60f4649b053fb2ea
 2024-08-28 16:02:42 +00:00
Justin Yun
0fa47f4a54 Update diff allowlist for soong system image build 
We already resolved files in system etc.
Remove them from the allowlist.

Bug: 346873717
Test: lunch aosp_cf_x86_64_phone-trunk_staging-userdebug && m
Change-Id: Ia38796aebe0e2e9a5d55e16f9c509c68214f687f
 2024-08-28 06:22:25 +00:00
Spandan Das
3d509d8ca1 Merge "Remove some files from packaging allowlist" into main am: 03b680d4ba am: 259692c6f3 
Original change: https://android-review.googlesource.com/c/platform/build/+/3241405

Change-Id: I28a231ae27bab800850c0a7f8476f51774c17ba1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-26 23:37:53 +00:00
Spandan Das
259692c6f3 Merge "Remove some files from packaging allowlist" into main am: 03b680d4ba 
Original change: https://android-review.googlesource.com/c/platform/build/+/3241405

Change-Id: I7b3ac632a4eabc19702c5d9460ec7d6ca3606fdf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-26 23:29:20 +00:00
Spandan Das
03b680d4ba Merge "Remove some files from packaging allowlist" into main 2024-08-26 23:26:10 +00:00
Spandan Das
0e695737e4 Remove some files from packaging allowlist 
These files are symlinks. With https://r.android.com/3200722, these
should be available in the soong built system image.

Test: presubmits
Change-Id: I4acb05ed8498dc8b7aac76e4c91b9173ed3d6574
 2024-08-26 21:29:24 +00:00
Treehugger Robot
b0b79f838e Merge "Revert "Fix problem of RepackApexPayload when using option --signing_args"" into main am: 1dbf5fb045 am: 17874e0299 
Original change: https://android-review.googlesource.com/c/platform/build/+/3242201

Change-Id: I43f619e1711628dafeb00705011727e4ae6cd52c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-26 17:04:26 +00:00
Treehugger Robot
17874e0299 Merge "Revert "Fix problem of RepackApexPayload when using option --signing_args"" into main am: 1dbf5fb045 
Original change: https://android-review.googlesource.com/c/platform/build/+/3242201

Change-Id: Id9e9606fd5f01c47a281a7aba6b056dcd394d90b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-26 16:55:57 +00:00
Treehugger Robot
1dbf5fb045 Merge "Revert "Fix problem of RepackApexPayload when using option --signing_args"" into main 2024-08-26 16:47:43 +00:00
Aaron Homer
58992a6052 Revert "Fix problem of RepackApexPayload when using option --signing_args" 
This reverts commit 5ebc4febe6.

Reason for revert: This is causing the signing args to be improperly passed to apexer, treating them as if they are not specified as all.

Change-Id: Ifa0f8444a4a1871802316511b0ff0735f3350b2c
Bug: 361784913
 2024-08-26 15:21:26 +00:00
Zhi Dou
3b8df957d8 Merge "Remove local copy of the flag file" into main am: 4fe368382d am: c0c37bb742 
Original change: https://android-review.googlesource.com/c/platform/build/+/3236943

Change-Id: I5224ebdcc0e66ccf9c824e88d032119b8cf9727c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-23 14:35:17 +00:00
Zhi Dou
c0c37bb742 Merge "Remove local copy of the flag file" into main am: 4fe368382d 
Original change: https://android-review.googlesource.com/c/platform/build/+/3236943

Change-Id: Ie18ba103ed07e1ae4b3fa83fb9c555f9f82443f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-23 14:27:20 +00:00
Zhi Dou
99023d6160 Remove local copy of the flag file 
This change removes the local copy of the flag file in PackageTable, and
FlagValueList.

PackageTable copied the entire flag file into memory, and the
FlagValueList copied the entire flag value list into memory. In this
change FlagValueList directly access the flag value list in the memory.
PackageTable will iterate the file, and find the target package node.

Change-Id: Id766c28b71a54290b266cc5f3f404f5c82590da2
Test: atest aconfig_storage_file.test.java aconfig_storage_read_api.test.java
Bug: 352078117
 2024-08-22 19:56:48 +00:00
Treehugger Robot
be37d3f911 Merge "Fix problem of RepackApexPayload when using option --signing_args" into main am: 2f0d0b861b am: 213b09e38a 
Original change: https://android-review.googlesource.com/c/platform/build/+/3221018

Change-Id: I5fe9070820813c788e1cbd079528d8e746162120
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-22 18:19:01 +00:00