Bill Yang
01c18ba25c
Revert "Revert "Export variable to soong for converting vintf_co..."
...
Revert submission 3235656-revert-3195743-compatibility_matrix-KLJOLWYIMW
Reason for revert: The root cause of the break is already be merged. Related changes: ag/29139095, ag/29139608
Reverted changes: /q/submissionid:3235656-revert-3195743-compatibility_matrix-KLJOLWYIMW
Change-Id: I40d9e6c03dd092783e86338a334851a36f5488dd
2024-09-05 09:22:17 +00:00
Automerger Merge Worker
80c3e721b9
Merge changes from topic "am-510e537a7c34466d8ed3053298cfa958" into main am: 84aefc948e
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3198230
Change-Id: Iaa8c952276cc1fb752bdfe1f4a0cba61a67ef08e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-09-05 02:57:12 +00:00
Ziwei Zhang
bcdc8a9615
[automerger skipped] Merge "RESTRICT AUTOMERGE: Package xTS console into CTS 14 to support MCTS." into android14-tests-dev am: 57fa0d3215
-s ours am: 81d9588d4c
-s ours
...
am skip reason: contains skip directive
Original change: https://android-review.googlesource.com/c/platform/build/+/3198230
Change-Id: Ie7603b90387d5c1a9672ee4d719bdbdbc476d654
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-09-05 02:57:07 +00:00
Automerger Merge Worker
98bcae86d6
Merge changes from topic "am-37a6674c47d345d5b8c04c1839d9e0dc" into android15-tests-dev am: ffc71467f0
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3198230
Change-Id: Ieda77ff6124ece43382b6f5c4231460eb1b82e03
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-09-05 02:56:43 +00:00
Ziwei Zhang
23de46a4dd
[automerger skipped] Merge "RESTRICT AUTOMERGE: Package xTS console into CTS 14 to support MCTS." into android14-tests-dev am: 57fa0d3215
-s ours am: 6032c5082b
-s ours
...
am skip reason: contains skip directive
Original change: https://android-review.googlesource.com/c/platform/build/+/3198230
Change-Id: Iff2d6b0c0f2b3ece8de3fb7436380b54db2cf9f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-09-05 02:56:40 +00:00
Automerger Merge Worker
ffc71467f0
Merge changes from topic "am-37a6674c47d345d5b8c04c1839d9e0dc" into android15-tests-dev
...
* changes:
[automerger skipped] Merge "RESTRICT AUTOMERGE: Package xTS console into CTS 14 to support MCTS." into android14-tests-dev am: 57fa0d3215
-s ours
[automerger skipped] RESTRICT AUTOMERGE: Package xTS console into CTS 14 to support MCTS. am: 660e2ef531
-s ours
2024-09-05 02:46:32 +00:00
Automerger Merge Worker
84aefc948e
Merge changes from topic "am-510e537a7c34466d8ed3053298cfa958" into main
...
* changes:
[automerger skipped] Merge "RESTRICT AUTOMERGE: Package xTS console into CTS 14 to support MCTS." into android14-tests-dev am: 57fa0d3215
-s ours
[automerger skipped] RESTRICT AUTOMERGE: Package xTS console into CTS 14 to support MCTS. am: 660e2ef531
-s ours
2024-09-05 02:46:29 +00:00
Ziwei Zhang
6032c5082b
[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: I6bf9215c916aa8a674cfd3fab93d59aa48c26442
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-09-05 02:46:26 +00:00
Ziwei Zhang
74e51c4695
[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: I9f882bb8119e3939c1996523b177712ac55b5a3c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-09-05 02:46:22 +00:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
Joe Onorato
31614fd24e
Add script that dumps all product config varaibles.
...
Test: build/make/ci/dump_product_config
Change-Id: If6b48fa69b6836ab2c06d6ebe22487001bcd6e77
2024-08-30 12:08:53 -07: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