Commit Graph

9857 Commits

Author SHA1 Message Date
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
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
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
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
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)
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
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
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
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
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
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
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
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
213b09e38a Merge "Fix problem of RepackApexPayload when using option --signing_args" into main am: 2f0d0b861b
Original change: https://android-review.googlesource.com/c/platform/build/+/3221018

Change-Id: Ic808716b0265425e19d0a71a9ef1f7c610655270
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-22 18:12:03 +00:00
Treehugger Robot
2f0d0b861b Merge "Fix problem of RepackApexPayload when using option --signing_args" into main 2024-08-22 18:01:13 +00:00
Treehugger Robot
f574cfe03c Merge "Re-generate 4K boot OTAs using signed boot.img during signing process" into main am: 939326d3be
Original change: https://android-review.googlesource.com/c/platform/build/+/3236656

Change-Id: Iddf44f50417927611bc9a7094da657c06a6f211f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-22 17:17:39 +00:00
Treehugger Robot
939326d3be Merge "Re-generate 4K boot OTAs using signed boot.img during signing process" into main 2024-08-22 17:09:06 +00:00
Kelvin Zhang
b707ea0206 Re-generate 4K boot OTAs using signed boot.img during signing process
Currently, dev option OTAs are generated using dev-key signed boot.img
On release-key devices, OTA will install successfully, but user would be
using dev-key signed boot image after reverting to 4K mode, and
subsequent OTAs would fail. This CL re-generates 4K boot OTA using
release-key signed boot.img , which allows normal OTAs after toggling
dev options.

Test: th
Bug: 354019928
Change-Id: I40811d6ed7a37f50edea77d245bf559b66da5a71
2024-08-21 10:36:57 -07:00
Jerome Gaillard
b0a67ce2df Merge "Add overlay files to layoutlib res.zip" into main am: d93f559871
Original change: https://android-review.googlesource.com/c/platform/build/+/3228769

Change-Id: Ie112b2e3818b497a2feae30f83f3c15a704e21ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-21 09:02:23 +00:00
Jerome Gaillard
c97c0b4a7c Add overlay files to layoutlib res.zip
This adds resource overlay files to the res.zip file created by
layoutlib_data.mk. This also updates the script generating the
corresponding SBOM file.

Bug: 335355919
Test: m layoutlib
Change-Id: I2427be23720324eb03bd428d220b8777e3bf49bb
2024-08-20 13:37:41 +01:00
Hieu Nguyen
5ebc4febe6 Fix problem of RepackApexPayload when using option --signing_args
The apex_util -> deapexer transition still passes signing args in as 1
huge string, just without the double qoutes. Once deapexer receives
the arugment, deapexer would attempt to shlex it, but double
quotes prevents proper shlexing, hence remove the double quotes.
As we added to log to monitor args parser when run apexer from
RepackApexPayload

2024-07-30 12:42:03 - common.py - INFO    :   Individual args list:
['/home/hieu/aosp/out/host/linux-x86/bin/apexer', '--force',
'--payload_only', '--do_not_check_keyname', '--apexer_tool_path',
'/home/hieu/aosp/out/host/linux-x86/bin:/home/hieu/aosp/out/host/linux-x86/bin:/home/hieu/aosp/out/host/linux-x86/bin:/home/hieu/aosp/prebuilts/clang/host/linux-x86/llvm-binutils-stable:/home/hieu/aosp/prebuilts/asuite/acloud/linux-x86:/home/hieu/aosp/prebuilts/asuite/aidegen/linux-x86:/home/hieu/aosp/prebuilts/asuite/atest/linux-x86:/home/hieu/aosp/prebuilts/jdk/jdk17/linux-x86/bin:/home/hieu/aosp/build/bazel/bin:/home/hieu/aosp/development/scripts:/home/hieu/aosp/prebuilts/devtools/tools:/home/hieu/aosp/prebuilts/misc/linux-x86/dtc:/home/hieu/aosp/prebuilts/misc/linux-x86/libufdt:/home/hieu/aosp/prebuilts/android-emulator/linux-x86_64:/home/hieu/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/usr/lib/wsl/lib:/mnt/c/Program Files/WindowsApps/MicrosoftCorporationII.WindowsSubsystemForLinux_2.2.4.0_x64__8wekyb3d8bbwe:/mnt/c/WINDOWS/system32:/mnt/c/WINDOWS:/mnt/c/WINDOWS/System32/Wbem:/mnt/c/WINDOWS/System32/WindowsPowerShell/v1.0/:/mnt/c/WINDOWS/System32/OpenSSH/:/mnt/c/Program Files/7-Zip:/mnt/c/Users/hnguy140/AppData/Local/Microsoft/WindowsApps:/snap/bin', '--manifest', '/tmp/tmpjk8as91m/apex_manifest.pb', '--build_info', '/tmp/tmpjk8as91m/apex_build_info.pb',
'--key', 'key_dir/avb.pem',
'--signing_args', '--signing_helper_with_files external/fnv/production-sign-tools/production-signing-scripts/IVIMB/signing_helper/avb_signing_helper.py',
'/tmp/tmpji2gvei4', '/tmp/tmpjk8as91m/apex_payload.img', '-v']

As monitor from the above log '--signing_helper_with_files
.../avb_signing_helper.py' is considered as a single argument which make
apexer to be confused. The correct ways of parsing arguments is
'--signing_helper_with_files' and '.../avb_signing_helper' should be
separate to 2 arguments instead merge it as one like current
implementation.

Change-Id: I913b6b3f2ff03d8ce2333b1c2c38178967766778
Signed-off-by: Hieu Nguyen <hnguy140@ford.com>
2024-08-16 17:43:08 +00:00
Xin Li
d18271c0c2 Merge aosp-24Q3-ts-dev
Bug: 358400644
Merged-In: Ia1f94ba19bab1f2e3b129827ad5634023290dbc5
Change-Id: Id01fbfb019f65f082b0b26897224260d38e4db59
2024-08-16 10:15:02 -07:00
Zhi Dou
b218b19b6a Merge "DO NOT MERGE: manually cherry pick" into aosp-main-future 2024-08-16 15:45:14 +00:00
Jooyung Han
f5d16e0a60 Merge "Add /odm/apex/ support." into main am: 113f1f5c7e
Original change: https://android-review.googlesource.com/c/platform/build/+/3217178

Change-Id: I4bfb322b0bb7ae1a605f1a98dc3d32048aefb5a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-16 04:00:29 +00:00
Jooyung Han
113f1f5c7e Merge "Add /odm/apex/ support." into main 2024-08-16 03:46:57 +00:00
Ted Bauer
d79db262a3 Merge "Parse protos in library" into main am: 91458b4cd4
Original change: https://android-review.googlesource.com/c/platform/build/+/3222383

Change-Id: Iaad2c4a2996d048bfd727708f1b6fd9acf8dac9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-15 22:35:30 +00:00
Ted Bauer
91458b4cd4 Merge "Parse protos in library" into main 2024-08-15 22:15:19 +00:00
Ted Bauer
6f12acb0da Parse protos in library
Bug: 342636474
Test: m
Change-Id: I4934fa2332b00084f73453945d6b4743566f6e48
2024-08-15 21:04:28 +00:00
Jihoon Kang
887384e80f Merge "Specify is_stubs_module property in selected aconfig library modules" into main am: 0c26850dba
Original change: https://android-review.googlesource.com/c/platform/build/+/3219855

Change-Id: I7287eb40524849f37d26ae103b3eae50bdf5b0f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-15 17:43:57 +00:00
Jihoon Kang
0c26850dba Merge "Specify is_stubs_module property in selected aconfig library modules" into main 2024-08-15 16:45:16 +00:00