StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
100,033 Commits 1 Branch 0 Tags
e501cac6c80835190da44fd6367d12a68dfa34c1
Commit Graph

100033 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Zhi Dou
e501cac6c8 Merge "change fileinputstream to filechannel" into main am: b7bb53d392 am: 23b0cba8d6 
Original change: https://android-review.googlesource.com/c/platform/build/+/3205700

Change-Id: I5f736f7952dd791bc2a330ef6a0b56917a7d8987
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-05 14:47:56 +00:00
Zhi Dou
23b0cba8d6 Merge "change fileinputstream to filechannel" into main am: b7bb53d392 
Original change: https://android-review.googlesource.com/c/platform/build/+/3205700

Change-Id: I6dc7fada9780a822d2b9ad891bbe0f0f6abd1736
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-05 14:10:49 +00:00
Zhi Dou
b7bb53d392 Merge "change fileinputstream to filechannel" into main 2024-08-05 13:49:24 +00:00
PODISHETTY KUMAR (xWF)
7f9777ece9 Merge "Revert "Prevent misconfigured cp_system_other_odex=1 device boots"" into main am: 556f030c41 am: 3c45bf096a 
Original change: https://android-review.googlesource.com/c/platform/build/+/3204712

Change-Id: I7e4754529e73c600c8453dc0f5cfb08aed38cab1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-05 06:27:28 +00:00
PODISHETTY KUMAR (xWF)
3c45bf096a Merge "Revert "Prevent misconfigured cp_system_other_odex=1 device boots"" into main am: 556f030c41 
Original change: https://android-review.googlesource.com/c/platform/build/+/3204712

Change-Id: I32fb38dba5b08138a4abc687802298b57e112790
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-05 06:01:28 +00:00
PODISHETTY KUMAR (xWF)
556f030c41 Merge "Revert "Prevent misconfigured cp_system_other_odex=1 device boots"" into main 2024-08-05 05:41:05 +00:00
PODISHETTY KUMAR (xWF)
d7e98c63e9 Revert "Prevent misconfigured cp_system_other_odex=1 device boots" 
This reverts commit 9c54f38250.

Reason for revert: <Droidmonitor created revert due to b/357468332. Will be verifying through ABTD before submission.>

Change-Id: I201339aa920dcb7fec5e8b6e74b0f0ff35c91416
 2024-08-05 03:55:55 +00:00
Spandan Das
f31afeec91 Merge "Prevent misconfigured cp_system_other_odex=1 device boots" into main am: fa154fd697 am: 1fd4fea110 
Original change: https://android-review.googlesource.com/c/platform/build/+/3205048

Change-Id: I4fe05bb983cc2cd7cea2ac86550d95abf4f7c07c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-05 02:53:04 +00:00
Spandan Das
1fd4fea110 Merge "Prevent misconfigured cp_system_other_odex=1 device boots" into main am: fa154fd697 
Original change: https://android-review.googlesource.com/c/platform/build/+/3205048

Change-Id: I0c773eed3d85023386a66b2ef06966b66490f106
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-05 02:33:16 +00:00
Spandan Das
fa154fd697 Merge "Prevent misconfigured cp_system_other_odex=1 device boots" into main 2024-08-05 02:15:34 +00:00
Treehugger Robot
9355a45b45 Merge "HSUM configuration in AOSP" into main 2024-08-03 03:08:17 +00:00
Treehugger Robot
3123dae407 Merge "Mark AP3A.240905.001 as merged in aosp-main-future" into aosp-main-future am: f0bb3a69d3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/28602127

Change-Id: If5eb123645525f1c03f8164a590b5105598db831
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-03 00:44:55 +00:00
Luca Farsi
a376e88f78 Merge "Don't build targets if they're not used." into main am: 1ef9d680af am: 14f6de4afc 
Original change: https://android-review.googlesource.com/c/platform/build/+/3204820

Change-Id: Ib4071d41a9c7ecdb103346284f01eace8d9b82e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-03 00:22:50 +00:00
Treehugger Robot
f0bb3a69d3 Merge "Mark AP3A.240905.001 as merged in aosp-main-future" into aosp-main-future 2024-08-03 00:21:44 +00:00
Zhi Dou
8af83ccd50 change fileinputstream to filechannel 
The restrict mode doesn't allow to have disk read from main thread. Some
apps enabled this check. The code in the dependencies of the
fileinputstream. This chagne switch to filechannel.

Test: presubmit
Bug: 356614910
Change-Id: Icf2175fe75ed1bfad4a048ead680b08e57d6c2ca
 2024-08-03 00:08:40 +00:00
Luca Farsi
14f6de4afc Merge "Don't build targets if they're not used." into main am: 1ef9d680af 
Original change: https://android-review.googlesource.com/c/platform/build/+/3204820

Change-Id: I1ac01bec631994f39c7086d55dafb3befb608427
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-03 00:03:12 +00:00
Luca Farsi
1ef9d680af Merge "Don't build targets if they're not used." into main 2024-08-02 23:36:03 +00:00
Luca Farsi
b24c1c3dbd Don't build targets if they're not used. 
Add functionality in build_test_suites.py to not build targets if
their outputs are not used in the test configurations saved in the build
context. If none of the tests reference the targets' outputs they will
not be built at all.

Note that the corresponding flags will need to be enabled for these
optimizations to take place.

Test: atest optimized_targets_test
Bug: 348489774
Change-Id: I8f0ac90e75552ae80073f13229b026c7f23476a6
 2024-08-02 14:45:36 -07:00
Spandan Das
9c54f38250 Prevent misconfigured cp_system_other_odex=1 device boots 
https://r.android.com/3177659 set ro.cp_system_other_odex=1 to request
copy of the dexpreopt app images to system_other partition on first
boot. This created a misconfiguration for devices that
1. Do not have a system_other partition
2. Do not have cppreopts.sh listed in PRODUCT_PACKAGES

This CL adds a conditional to request this copy operation in devices
with a system_other partition, and adds cppreopts.sh to PRODUCT_PACKAGES

Test: presubmits
Bug: 356075780

Change-Id: I703c15a5fd96d1efad7f93e6bcb1b968ae4f38a1
 2024-08-02 21:28:00 +00:00
Lokesh Kumar Goel
33ec5e0c7d Merge "Allow PLATFORM_BASE_OS override from product config" into main am: a4007985ec am: 8d2c3f399b 
Original change: https://android-review.googlesource.com/c/platform/build/+/3028111

Change-Id: I94093a926aae67c77092cba917bcac5b70f873af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-02 15:32:40 +00:00
Chaitanya Cheemala (xWF)
68951fffda [automerger skipped] Merge "Revert "RESTRICT AUTOMERGE: Package xTS console into CTS 13 to support MCTS."" into android13-tests-dev am: 1b7445982b am: 8a2a18db93 am: ced68e5c94 am: 70f64db1ee -s ours am: 9d8d2c89cc -s ours am: f9e327a46b -s ours am: fdcd9527f9 -s ours 
am skip reason: contains skip directive

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

Change-Id: Icb7bc45f5577539cf1b8f7c4926ab3ef26fbb2c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-02 15:28:42 +00:00
PODISHETTY KUMAR (xWF)
b83e8fbfce [automerger skipped] Revert "RESTRICT AUTOMERGE: Package xTS console into CTS 13 to support MCTS." am: 68a4dda683 am: df80a81fda am: 52b25bf5cb am: 3a750dd93c -s ours am: 25852318d5 -s ours am: 8f3f54fa10 -s ours am: 539f3c1d02 -s ours 
am skip reason: contains skip directive

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

Change-Id: Ib37bd2e502c610867b19ada0cd28df9c084f1912
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-02 15:28:37 +00:00
Chaitanya Cheemala (xWF)
0326c385ff [automerger skipped] Merge "Revert "RESTRICT AUTOMERGE: Package xTS console into CTS 13 to support MCTS."" into android13-tests-dev am: 1b7445982b am: 8a2a18db93 am: 9036315df2 -s ours am: 012efde47d -s ours am: 50bb8807b5 -s ours am: c3151e827b -s ours 
am skip reason: contains skip directive

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

Change-Id: I0edce672f3bcf9734d9cfc255434f055ffbf5116
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-02 15:28:20 +00:00
PODISHETTY KUMAR (xWF)
0787443fce [automerger skipped] Revert "RESTRICT AUTOMERGE: Package xTS console into CTS 13 to support MCTS." am: 68a4dda683 am: df80a81fda am: 677ed44bc2 -s ours am: 0e11ae4340 -s ours am: 605f1bdbac -s ours am: 9e75143627 -s ours 
am skip reason: contains skip directive

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

Change-Id: I62e948cf128370031fb042e5c1e78f266dc535c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-02 15:28:15 +00:00
Lokesh Kumar Goel
8d2c3f399b Merge "Allow PLATFORM_BASE_OS override from product config" into main am: a4007985ec 
Original change: https://android-review.googlesource.com/c/platform/build/+/3028111

Change-Id: Ie0699447315012d2a1832ddeb4b0d5f827a3f32b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-02 15:16:14 +00:00
Chaitanya Cheemala (xWF)
fdcd9527f9 [automerger skipped] Merge "Revert "RESTRICT AUTOMERGE: Package xTS console into CTS 13 to support MCTS."" into android13-tests-dev am: 1b7445982b am: 8a2a18db93 am: ced68e5c94 am: 70f64db1ee -s ours am: 9d8d2c89cc -s ours am: f9e327a46b -s ours 
am skip reason: contains skip directive

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

Change-Id: I64515517a23f5d2f141d04e0dc61235ae74463cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-02 15:09:17 +00:00
Chaitanya Cheemala (xWF)
350983039f [automerger skipped] Merge "Revert "RESTRICT AUTOMERGE: Package xTS console into CTS 13 to support MCTS."" into android13-tests-dev am: 1b7445982b am: 8a2a18db93 am: ced68e5c94 am: 70f64db1ee -s ours am: 9d8d2c89cc -s ours am: c54bb1d34c -s ours 
am skip reason: contains skip directive

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

Change-Id: I082352ecfd740381dba2828af2a696f1b1b6f77e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-02 15:09:16 +00:00
PODISHETTY KUMAR (xWF)
539f3c1d02 [automerger skipped] Revert "RESTRICT AUTOMERGE: Package xTS console into CTS 13 to support MCTS." am: 68a4dda683 am: df80a81fda am: 52b25bf5cb am: 3a750dd93c -s ours am: 25852318d5 -s ours am: 8f3f54fa10 -s ours 
am skip reason: contains skip directive

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

Change-Id: Ie6ab899727786811c2ae647c33bb1c9d866f2401
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-02 15:09:13 +00:00
PODISHETTY KUMAR (xWF)
5d42993de6 [automerger skipped] Revert "RESTRICT AUTOMERGE: Package xTS console into CTS 13 to support MCTS." am: 68a4dda683 am: df80a81fda am: 52b25bf5cb am: 3a750dd93c -s ours am: 25852318d5 -s ours am: 1303050a36 -s ours 
am skip reason: contains skip directive

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

Change-Id: I96b4e7edf8c5b129abaeccf2c9b33b219d908a7d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-02 15:09:11 +00:00
Chaitanya Cheemala (xWF)
c3151e827b [automerger skipped] Merge "Revert "RESTRICT AUTOMERGE: Package xTS console into CTS 13 to support MCTS."" into android13-tests-dev am: 1b7445982b am: 8a2a18db93 am: 9036315df2 -s ours am: 012efde47d -s ours am: 50bb8807b5 -s ours 
am skip reason: contains skip directive

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

Change-Id: I35fb8d3bfc873c638ced2f697dddcf7f69e87d54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-02 15:09:01 +00:00
PODISHETTY KUMAR (xWF)
9e75143627 [automerger skipped] Revert "RESTRICT AUTOMERGE: Package xTS console into CTS 13 to support MCTS." am: 68a4dda683 am: df80a81fda am: 677ed44bc2 -s ours am: 0e11ae4340 -s ours am: 605f1bdbac -s ours 
am skip reason: contains skip directive

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

Change-Id: I70430a3e1d91ff472331aa64ddfffc0195f16cdf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-02 15:08:58 +00:00
Chaitanya Cheemala (xWF)
8e5c2fdca5 [automerger skipped] Merge "Revert "RESTRICT AUTOMERGE: Package xTS console into CTS 13 to support MCTS."" into android13-tests-dev am: 1b7445982b am: 8a2a18db93 am: 9036315df2 -s ours am: 012efde47d -s ours am: 78c066ecb2 -s ours 
am skip reason: contains skip directive

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

Change-Id: I476ed5e3aaf6edd59b3ba42338e4b08252856226
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-02 15:08:48 +00:00
PODISHETTY KUMAR (xWF)
0eed35c556 [automerger skipped] Revert "RESTRICT AUTOMERGE: Package xTS console into CTS 13 to support MCTS." am: 68a4dda683 am: df80a81fda am: 677ed44bc2 -s ours am: 0e11ae4340 -s ours am: 56c7449691 -s ours 
am skip reason: contains skip directive

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

Change-Id: I420691c1332fa2d399d92899d4d441e828405057
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-02 15:08:42 +00:00
Lokesh Kumar Goel
a4007985ec Merge "Allow PLATFORM_BASE_OS override from product config" into main 2024-08-02 14:55:29 +00:00
Chaitanya Cheemala (xWF)
f9e327a46b [automerger skipped] Merge "Revert "RESTRICT AUTOMERGE: Package xTS console into CTS 13 to support MCTS."" into android13-tests-dev am: 1b7445982b am: 8a2a18db93 am: ced68e5c94 am: 70f64db1ee -s ours am: 9d8d2c89cc -s ours 
am skip reason: contains skip directive

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

Change-Id: Icf1d08d917b7ba601ba498c05d805ef4feb7643b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-02 14:44:35 +00:00
PODISHETTY KUMAR (xWF)
8f3f54fa10 [automerger skipped] Revert "RESTRICT AUTOMERGE: Package xTS console into CTS 13 to support MCTS." am: 68a4dda683 am: df80a81fda am: 52b25bf5cb am: 3a750dd93c -s ours am: 25852318d5 -s ours 
am skip reason: contains skip directive

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

Change-Id: I49d6af2a6b67483f50d636cd3ac542c009c87d67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-02 14:44:30 +00:00
Chaitanya Cheemala (xWF)
c54bb1d34c [automerger skipped] Merge "Revert "RESTRICT AUTOMERGE: Package xTS console into CTS 13 to support MCTS."" into android13-tests-dev am: 1b7445982b am: 8a2a18db93 am: ced68e5c94 am: 70f64db1ee -s ours am: 9d8d2c89cc -s ours 
am skip reason: contains skip directive

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

Change-Id: Iff1c7cefe7ab5c098a1a393c06b151c2b4cc1d07
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-02 14:39:13 +00:00
Automerger Merge Worker
8741c6dd69 Merge changes from topic "am-43b4283abaf141c7ad054d3d2f41c002" into android14-tests-dev am: 575462fb40 am: 107af3558f am: 72a05f80cc am: fced3e20d8 
Original change: https://android-review.googlesource.com/c/platform/build/+/3204292

Change-Id: Ib23abece88074aba72a6362c6a46b366b4fde14e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-02 14:39:11 +00:00
PODISHETTY KUMAR (xWF)
1303050a36 [automerger skipped] Revert "RESTRICT AUTOMERGE: Package xTS console into CTS 13 to support MCTS." am: 68a4dda683 am: df80a81fda am: 52b25bf5cb am: 3a750dd93c -s ours am: 25852318d5 -s ours 
am skip reason: contains skip directive

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

Change-Id: I521ec744ddebcce2cc935ce0671946c16a175a17
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-02 14:39:10 +00:00
Chaitanya Cheemala (xWF)
e3c1481230 [automerger skipped] Merge "Revert "RESTRICT AUTOMERGE: Package xTS console into CTS 13 to support MCTS."" into android13-tests-dev am: 1b7445982b -s ours am: 4a1a977f47 -s ours am: ae4c50560f -s ours am: 194990b63e -s ours am: e5c71bc1d5 -s ours 
am skip reason: contains skip directive

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

Change-Id: Iff984066b26d49aa039677d6eeb30a89e70492ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-02 14:39:07 +00:00
Chaitanya Cheemala (xWF)
78c066ecb2 [automerger skipped] Merge "Revert "RESTRICT AUTOMERGE: Package xTS console into CTS 13 to support MCTS."" into android13-tests-dev am: 1b7445982b am: 8a2a18db93 am: 9036315df2 -s ours am: 012efde47d -s ours 
am skip reason: contains skip directive

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

Change-Id: I388721a0cec2576225144c3a40a80104d9c4d4f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-02 14:38:57 +00:00
PODISHETTY KUMAR (xWF)
56c7449691 [automerger skipped] Revert "RESTRICT AUTOMERGE: Package xTS console into CTS 13 to support MCTS." am: 68a4dda683 am: df80a81fda am: 677ed44bc2 -s ours am: 0e11ae4340 -s ours 
am skip reason: contains skip directive

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

Change-Id: I0a86209c05994d508a14647f52ab0970efc79807
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-02 14:38:54 +00:00
Chaitanya Cheemala (xWF)
9d8d2c89cc [automerger skipped] Merge "Revert "RESTRICT AUTOMERGE: Package xTS console into CTS 13 to support MCTS."" into android13-tests-dev am: 1b7445982b am: 8a2a18db93 am: ced68e5c94 am: 70f64db1ee -s ours 
am skip reason: contains skip directive

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

Change-Id: I3c0eefc1508040da5142b1ba364d16799f395f34
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-02 14:38:44 +00:00
PODISHETTY KUMAR (xWF)
25852318d5 [automerger skipped] Revert "RESTRICT AUTOMERGE: Package xTS console into CTS 13 to support MCTS." am: 68a4dda683 am: df80a81fda am: 52b25bf5cb am: 3a750dd93c -s ours 
am skip reason: contains skip directive

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

Change-Id: I360ce3be8c3c4ebe78b40e9f272246e110768962
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-02 14:38:39 +00:00
Chaitanya Cheemala (xWF)
50bb8807b5 [automerger skipped] Merge "Revert "RESTRICT AUTOMERGE: Package xTS console into CTS 13 to support MCTS."" into android13-tests-dev am: 1b7445982b am: 8a2a18db93 am: 9036315df2 -s ours am: 012efde47d -s ours 
am skip reason: contains skip directive

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

Change-Id: I31cfece4d1789a6b725aeaf8c494ac998337069d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-02 14:38:35 +00:00
PODISHETTY KUMAR (xWF)
605f1bdbac [automerger skipped] Revert "RESTRICT AUTOMERGE: Package xTS console into CTS 13 to support MCTS." am: 68a4dda683 am: df80a81fda am: 677ed44bc2 -s ours am: 0e11ae4340 -s ours 
am skip reason: contains skip directive

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

Change-Id: Id250e6dfe9a8b37e39c2d8b0c15ca2817430ef41
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-02 14:38:30 +00:00
Chaitanya Cheemala (xWF)
012efde47d [automerger skipped] Merge "Revert "RESTRICT AUTOMERGE: Package xTS console into CTS 13 to support MCTS."" into android13-tests-dev am: 1b7445982b am: 8a2a18db93 am: 9036315df2 -s ours 
am skip reason: contains skip directive

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

Change-Id: I0486d8dc5ed090800ca5ff2f5d3fabb00c8dc696
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-02 14:22:53 +00:00
PODISHETTY KUMAR (xWF)
0e11ae4340 [automerger skipped] Revert "RESTRICT AUTOMERGE: Package xTS console into CTS 13 to support MCTS." am: 68a4dda683 am: df80a81fda am: 677ed44bc2 -s ours 
am skip reason: contains skip directive

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

Change-Id: I90952166fb327001ced5b0f7dff3809e85f375c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-02 14:22:49 +00:00
Automerger Merge Worker
fced3e20d8 Merge changes from topic "am-43b4283abaf141c7ad054d3d2f41c002" into android14-tests-dev am: 575462fb40 am: 107af3558f am: 72a05f80cc 
Original change: https://android-review.googlesource.com/c/platform/build/+/3204292

Change-Id: I48d4fbed513f42ff7ad460a6f7da54e9bb78cc3d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-02 14:22:41 +00:00
Chaitanya Cheemala (xWF)
e5c71bc1d5 [automerger skipped] Merge "Revert "RESTRICT AUTOMERGE: Package xTS console into CTS 13 to support MCTS."" into android13-tests-dev am: 1b7445982b -s ours am: 4a1a977f47 -s ours am: ae4c50560f -s ours am: 194990b63e -s ours 
am skip reason: contains skip directive

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

Change-Id: I480e138fd62b38361b6fa0fe4be17b7b5bfbe5ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-02 14:22:38 +00:00