Commit Graph

100817 Commits

Author SHA1 Message Date
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
Android Build Coastguard Worker
b61adc0b5d Make change and version bump to AP4A.240905.001
Snap for 12319997 from 34bfd34905 to 24Q4-release

Change-Id: I92af713c6840070a54751e3fd3dc7c1638d7505c
2024-09-04 23:44:32 +00:00
Chris Dombroski
daca2e7783 Move copy destination to "sts-sdk"
Also remove packaged Java

Bug: 364712647
Test: manual
Change-Id: I5b32aaa7b13ca5f4967e6214ce81dbe3fbd58791
2024-09-04 23:07:02 +00: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
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
Elliott Hughes
09796a9d00 Merge "Remove messaging package." into main am: 8db9956a75 am: 0967bbdb04
Original change: https://android-review.googlesource.com/c/platform/build/+/3242200

Change-Id: I2db5e29e2d285e6b2b7c95d1c7c4e8a73320860d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-04 14:22:38 +00:00
Elliott Hughes
0967bbdb04 Merge "Remove messaging package." into main am: 8db9956a75
Original change: https://android-review.googlesource.com/c/platform/build/+/3242200

Change-Id: Ic902392b5ff442e94db6d8fa7341c259b1063ff8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-04 14:13:34 +00:00
Elliott Hughes
8db9956a75 Merge "Remove messaging package." into main 2024-09-04 14:02:00 +00:00
Ziwei Zhang
660e2ef531 RESTRICT AUTOMERGE: Package xTS console into CTS 14 to support MCTS.
Test: presubmit
Bug: 348121714
Change-Id: I7f24f8f8351966205c5afec2a0b8191266086864
2024-09-04 07:50:46 +00:00
Android Build Coastguard Worker
050dbe7ed4 [coastguard skipped] Merge sparse cherrypicks from sparse-12301355-L56800030006212796 into 24Q4-release.
COASTGUARD_SKIP: I5706c2246d66933519dab2735e1e0df1bf7a7ccb

Change-Id: Id431206591c4eb256b117408be10bd29b5878cf5
2024-09-04 05:32:13 +00:00
Android Build Coastguard Worker
cd6138bde9 Version bump to AP4A.240830.001.X2 [core/build_id.mk]
Change-Id: I5706c2246d66933519dab2735e1e0df1bf7a7ccb
2024-09-04 05:30:46 +00:00
Treehugger Robot
6b0523139e Merge "Move COMPATIBILITY.tradefed_tests_dir to proper place" into main am: 6ed53f2e44 am: 54ab3cf7b3
Original change: https://android-review.googlesource.com/c/platform/build/+/3249611

Change-Id: I534c6102dfa739bc99a39424a8dbe3fb7d62760a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-04 04:46:53 +00:00
Treehugger Robot
54ab3cf7b3 Merge "Move COMPATIBILITY.tradefed_tests_dir to proper place" into main am: 6ed53f2e44
Original change: https://android-review.googlesource.com/c/platform/build/+/3249611

Change-Id: Icc6f1bd00a05d478da2311fa13d909c79868f729
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-04 04:37:45 +00:00
Treehugger Robot
6ed53f2e44 Merge "Move COMPATIBILITY.tradefed_tests_dir to proper place" into main 2024-09-04 04:27:06 +00:00
Steven Moreland
dbb518c74a Merge "Monotonicity for NEED_AIDL_NDK_PLATFORM_BACKEND." into main am: 9d3787b166 am: 58ff2ba627
Original change: https://android-review.googlesource.com/c/platform/build/+/3248862

Change-Id: Iaff8b55114ea0082cce76cec34d78c42dc962328
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-04 00:06:05 +00:00
Steven Moreland
58ff2ba627 Merge "Monotonicity for NEED_AIDL_NDK_PLATFORM_BACKEND." into main am: 9d3787b166
Original change: https://android-review.googlesource.com/c/platform/build/+/3248862

Change-Id: I3aad2af970caf38cf32ffb7a5e28178591ec2574
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-03 23:56:21 +00:00
Steven Moreland
9d3787b166 Merge "Monotonicity for NEED_AIDL_NDK_PLATFORM_BACKEND." into main 2024-09-03 23:44:16 +00:00
Android Build Coastguard Worker
1663faff07 Make change and version bump to AP4A.240904.001
Snap for 12313714 from 24b45be9a0 to 24Q4-release

Change-Id: I284a38f9559836a542e15c0003aa84b01af978e3
2024-09-03 23:44:13 +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
Android Build Coastguard Worker
8851fa65e9 Version bump to AP4A.240903.002 [core/build_id.mk]
Change-Id: Ibbf58ed74f5f57d51dffa383935a260789383397
2024-09-03 16:41:08 +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
Android Build Coastguard Worker
5ab5a60262 Make change and version bump to AP4A.240903.001
Snap for 12309590 from e92f28e720 to 24Q4-release

Change-Id: I3825f7b9d7c9de4658ce9d7b2b3a701eeb279e5a
2024-09-02 23:44:09 +00:00
Android Build Coastguard Worker
d8817c31b5 [coastguard skipped] Merge sparse cherrypicks from sparse-12272923-L23300030006156788 into 24Q4-release.
COASTGUARD_SKIP: I97ba62249b68063bad93509b69f62752d2e5ac91
COASTGUARD_SKIP: Ifa0f8444a4a1871802316511b0ff0735f3350b2c

Change-Id: I3c054a10092ba89a8e4ba0e93235d89ae58d05dd
2024-09-02 10:14:42 +00:00
Android Build Coastguard Worker
5c7c359209 Make change and version bump to AP4A.240824.001.B1
Merge cherrypicks of ['android-review.googlesource.com/3242201'] into sparse-12272923-L23300030006156788.
SPARSE_CHANGE: Ifa0f8444a4a1871802316511b0ff0735f3350b2c

Change-Id: I97ba62249b68063bad93509b69f62752d2e5ac91
2024-09-02 10:13:35 +00:00
Aaron Homer
1313547aec 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.

Bug: 361784913
(cherry picked from https://android-review.googlesource.com/q/commit:58992a6052555872e0bfceb9e27022c5432ef761)
Merged-In: Ifa0f8444a4a1871802316511b0ff0735f3350b2c
Change-Id: Ifa0f8444a4a1871802316511b0ff0735f3350b2c
2024-09-02 10:13:04 +00:00
Android Build Coastguard Worker
e400d5b3c3 Make change and version bump to AP4A.240902.001
Snap for 12306720 from e92f28e720 to 24Q4-release

Change-Id: Ie2135e8cab303a90b832c3da62561be29404d25b
2024-09-01 21:44:44 +00:00
Treehugger Robot
e92f28e720 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Enable build MCTS on aosp-android14" into android14-tests-dev am: 426ac7045b am: 7f9fac5aa8 am: d44141f7f1 -s ours
am skip reason: contains skip directive

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

Change-Id: I03bab153303a709a687b915f52cf3fedbc6cf495
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-01 13:35:22 +00:00
Tongbo Liu
495e6de9a6 [automerger skipped] [RESTRICT AUTOMERGE] Enable build MCTS on aosp-android14 am: 0e6a163603 am: 2fced967d6 -s ours am: f9cf7828de -s ours
am skip reason: contains skip directive

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

Change-Id: I5e2511f4f18a45997932eb5153c9fd80004be418
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-01 13:35:09 +00:00
Treehugger Robot
d44141f7f1 Merge "[RESTRICT AUTOMERGE] Enable build MCTS on aosp-android14" into android14-tests-dev am: 426ac7045b am: 7f9fac5aa8
Original change: https://android-review.googlesource.com/c/platform/build/+/3196091

Change-Id: I7033c0a80fc51380c53c0f72178d8d9336bc1f0f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-01 13:04:13 +00:00
Tongbo Liu
f9cf7828de [automerger skipped] [RESTRICT AUTOMERGE] Enable build MCTS on aosp-android14 am: 0e6a163603 am: 2fced967d6 -s ours
am skip reason: skipped by liutongbo

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

Change-Id: Id84b6929b8ac32fabf10dd64e927ad9e4dc5e03e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-01 13:04:09 +00:00
Treehugger Robot
33fb465450 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Enable build MCTS on aosp-android14" into android14-tests-dev am: 426ac7045b am: 7f9fac5aa8 am: 08a7d4de5d am: 04abcc6874 -s ours
am skip reason: contains skip directive

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

Change-Id: I27b340c4388b802357b52fe8d98f5205365b7e08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-01 06:54:56 +00:00
Tongbo Liu
ed10a3bc5e [automerger skipped] [RESTRICT AUTOMERGE] Enable build MCTS on aosp-android14 am: 0e6a163603 am: 2fced967d6 am: 134d956b60 am: b2046b6351 -s ours
am skip reason: contains skip directive

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

Change-Id: I5013b60608914de0cdc915dd6f47fdaa2e585913
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-01 06:54:52 +00:00