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
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
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
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
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
Treehugger Robot
04abcc6874
Merge "[RESTRICT AUTOMERGE] Enable build MCTS on aosp-android14" into android14-tests-dev am: 426ac7045b
am: 7f9fac5aa8
am: 08a7d4de5d
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3196091
Change-Id: If40fabbbaf996cb2b9bc480f7851660ffd5906e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-09-01 06:34:25 +00:00
Tongbo Liu
b2046b6351
[RESTRICT AUTOMERGE] Enable build MCTS on aosp-android14 am: 0e6a163603
am: 2fced967d6
am: 134d956b60
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3196091
Change-Id: Ic30c28563eb18cc05a2c6ac9376059077c6530fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-09-01 06:34:21 +00:00
Treehugger Robot
08a7d4de5d
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: I2a42020abcfe0bb28f6991478147ca92fffebb6e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-09-01 06:05:02 +00:00
Tongbo Liu
134d956b60
[RESTRICT AUTOMERGE] Enable build MCTS on aosp-android14 am: 0e6a163603
am: 2fced967d6
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3196091
Change-Id: I9164eb5c21841fa657949c0e5fa5a62984e7fdf3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-09-01 06:04:59 +00:00
Treehugger Robot
43b085235e
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Enable build MCTS on aosp-android14" into android14-tests-dev am: 426ac7045b
-s ours am: dcc189e724
-s ours am: 5cf179d193
-s ours
...
am skip reason: contains skip directive
Original change: https://android-review.googlesource.com/c/platform/build/+/3196091
Change-Id: I799b72f82cdac0b023c65d9d3cd7f34487bd2026
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-09-01 06:04:40 +00:00
Tongbo Liu
8051e59ad6
[automerger skipped] [RESTRICT AUTOMERGE] Enable build MCTS on aosp-android14 am: 0e6a163603
-s ours am: d61635fa07
-s ours am: 3d948de394
-s ours
...
am skip reason: contains skip directive
Original change: https://android-review.googlesource.com/c/platform/build/+/3196091
Change-Id: I1223bb6307acd16196e273f405bf98ccbe920998
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-09-01 06:04:37 +00:00
Treehugger Robot
5cf179d193
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Enable build MCTS on aosp-android14" into android14-tests-dev am: 426ac7045b
-s ours am: dcc189e724
-s ours
...
am skip reason: contains skip directive
Original change: https://android-review.googlesource.com/c/platform/build/+/3196091
Change-Id: I3a33b1148438e10daabb1ae318fb70dacde23a85
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-09-01 05:55:18 +00:00
Tongbo Liu
3d948de394
[automerger skipped] [RESTRICT AUTOMERGE] Enable build MCTS on aosp-android14 am: 0e6a163603
-s ours am: d61635fa07
-s ours
...
am skip reason: contains skip directive
Original change: https://android-review.googlesource.com/c/platform/build/+/3196091
Change-Id: Ide124b2fa390693793ff9991cb83e082f1771380
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-09-01 05:55:09 +00:00
Automerger Merge Worker
01ddea50f4
Merge changes from topic "am-c7ae5aac1ddb4a3497131b161eb48568" into main am: 1bc29898e6
am: 8fd91cc919
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3196091
Change-Id: I80ee5d33043f95a18805cc9eccc5aeef8555f2e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-09-01 05:54:47 +00:00
Treehugger Robot
106337b9e3
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Enable build MCTS on aosp-android14" into android14-tests-dev am: 426ac7045b
-s ours am: 49c3d6e71d
-s ours am: 5adff03c34
-s ours
...
am skip reason: contains skip directive
Original change: https://android-review.googlesource.com/c/platform/build/+/3196091
Change-Id: I25876dc648fd693efdebd0aaa9f32c0a5ea9df1b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-09-01 05:54:44 +00:00
Automerger Merge Worker
8fd91cc919
Merge changes from topic "am-c7ae5aac1ddb4a3497131b161eb48568" into main am: 1bc29898e6
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3196091
Change-Id: I2e3d19370c42d72171449b9b4d37945e15ce45bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-09-01 05:45:46 +00:00
Treehugger Robot
5adff03c34
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Enable build MCTS on aosp-android14" into android14-tests-dev am: 426ac7045b
-s ours am: 49c3d6e71d
-s ours
...
am skip reason: contains skip directive
Original change: https://android-review.googlesource.com/c/platform/build/+/3196091
Change-Id: Iad4ec85f3f4210fafd7ae9c5152e09f8ca9dc75b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-09-01 05:45:43 +00:00
Treehugger Robot
7f9fac5aa8
Merge "[RESTRICT AUTOMERGE] Enable build MCTS on aosp-android14" into android14-tests-dev am: 426ac7045b
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3196091
Change-Id: Ibecbb553e6f2dab6ee7451782855f470886a0ac9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-09-01 05:45:42 +00:00
Tongbo Liu
2fced967d6
[RESTRICT AUTOMERGE] Enable build MCTS on aosp-android14 am: 0e6a163603
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3196091
Change-Id: I767fb38cc34afd5f8b200cec97a231f71eaa9674
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-09-01 05:45:39 +00:00
Treehugger Robot
dcc189e724
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Enable build MCTS on aosp-android14" into android14-tests-dev am: 426ac7045b
-s ours
...
am skip reason: contains skip directive
Original change: https://android-review.googlesource.com/c/platform/build/+/3196091
Change-Id: I77dc97ce69e4a03be325b1e2682414fd9b9ce903
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-09-01 05:45:02 +00:00
Tongbo Liu
d61635fa07
[automerger skipped] [RESTRICT AUTOMERGE] Enable build MCTS on aosp-android14 am: 0e6a163603
-s ours
...
am skip reason: contains skip directive
Original change: https://android-review.googlesource.com/c/platform/build/+/3196091
Change-Id: I445f9330f1cc8f4ad7277f9dc34c409c9deab902
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-09-01 05:44:56 +00:00
Automerger Merge Worker
1bc29898e6
Merge changes from topic "am-c7ae5aac1ddb4a3497131b161eb48568" into main
...
* changes:
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Enable build MCTS on aosp-android14" into android14-tests-dev am: 426ac7045b
-s ours
[automerger skipped] [RESTRICT AUTOMERGE] Enable build MCTS on aosp-android14 am: 0e6a163603
-s ours
2024-09-01 05:33:18 +00:00
Treehugger Robot
49c3d6e71d
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Enable build MCTS on aosp-android14" into android14-tests-dev am: 426ac7045b
-s ours
...
am skip reason: contains skip directive
Original change: https://android-review.googlesource.com/c/platform/build/+/3196091
Change-Id: Ifa0ed8041fa90f52ace20b6031361d0d73cdcc13
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-09-01 05:33:02 +00:00
Tongbo Liu
74f262f6fe
[automerger skipped] [RESTRICT AUTOMERGE] Enable build MCTS on aosp-android14 am: 0e6a163603
-s ours
...
am skip reason: contains skip directive
Original change: https://android-review.googlesource.com/c/platform/build/+/3196091
Change-Id: If9462c7573c483063e8cd3e5eea17150205ba061
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-09-01 05:32:57 +00:00
Treehugger Robot
426ac7045b
Merge "[RESTRICT AUTOMERGE] Enable build MCTS on aosp-android14" into android14-tests-dev
2024-09-01 05:18:06 +00:00
Steven Moreland
357d069f7f
Monotonicity for NEED_AIDL_NDK_PLATFORM_BACKEND.
...
Hint to partners this will go away. We have limited
testing of this option, and we shouldn't maintain two
ways of handling NDK AIDL variants. So, this way
we can remove it in the future. :D
Bug: 161456198
Test: build
Change-Id: I5ae43b4f1b6c0d7253e82caeb338b69b7e00fdb6
2024-08-30 23:28:23 +00: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
Treehugger Robot
9f254c6b5d
Merge "java reader reads directly from map" into main
2024-08-30 21:07:59 +00:00