Julien Desprez
56d335bdb5
Revert "Add Traefed Contrib to CATBox"
...
This reverts commit a527b1a0ee
.
Reason for revert: tradefed-contrib isn't an allowed dependency outside tradefed. Suites shouldn't use it. This breaks prebuilts in udc-*
Bug: 280372052
Change-Id: Id840568f36a801e19e7bb8e9c34cef2aeb625f1d
Ignore-AOSP-First: revert of CL submitted in internal anyway
2023-05-02 22:08:21 +00:00
Treehugger Robot
188fdcd405
Merge "add PRODUCT_SOURCE_ROOT_DIRS product variable" am: d67a345f9a
am: 2e5dfd6a0b
am: 1045e6e398
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2448662
Change-Id: I5709d6e7acce11251c3528a968892772126365a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-30 17:42:35 +00:00
Treehugger Robot
1045e6e398
Merge "add PRODUCT_SOURCE_ROOT_DIRS product variable" am: d67a345f9a
am: 2e5dfd6a0b
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2448662
Change-Id: Ic468ff195cbfaa55e00ce2aa6cbdf74ffca077a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-30 17:34:11 +00:00
Treehugger Robot
d67a345f9a
Merge "add PRODUCT_SOURCE_ROOT_DIRS product variable"
2023-03-29 17:04:37 +00:00
Sam Delmerico
4c3b83fe70
add PRODUCT_SOURCE_ROOT_DIRS product variable
...
Change-Id: I31590eb133511a5dbdb8d6fe436cf511d1a160a2
2023-03-27 14:40:50 -04:00
Colin Cross
7d9504703a
Merge "Don't read test mapping list in Make" am: 2feb102e4d
am: 4979af18b9
am: 99a26d0bfd
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2506833
Change-Id: Iab99c4cbf551f50882504d2df462e124aa76bda7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-24 17:44:18 +00:00
Colin Cross
99a26d0bfd
Merge "Don't read test mapping list in Make" am: 2feb102e4d
am: 4979af18b9
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2506833
Change-Id: I6bb66b00b8344dafcea5825de2e5a65463d186e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-24 16:55:11 +00:00
Colin Cross
01475b41fb
Don't read test mapping list in Make
...
Reading the test mapping list in Make causes Kati to regenerate
any time a TEST_MAPPING file is added or removed. Pass the file
to the rule and read it during ninja instead.
Bug: 274987114
Test: m test_mapping
Change-Id: I68a76646d70c85b2cb992e4da52a7854acd370b9
2023-03-24 04:33:07 +00:00
Julien Desprez
1c6aa54306
Merge changes from topic "presubmit-am-47a13f40ada54c9497aaa1d5e38a931a" into sc-qpr1-dev am: 48c10589c6
am: cd608825a3
am: 50d29f770b
am: 63c3099dc8
am: 660e9fa2e3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20754151
Change-Id: I3981b8677b91900aa1785c09faf35dc09cfdc638
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-22 03:48:26 +00:00
Julien Desprez
f4c157e4cf
Merge changes from topic "presubmit-am-47a13f40ada54c9497aaa1d5e38a931a" into sc-qpr1-dev am: 48c10589c6
am: cd608825a3
am: 50d29f770b
am: 6bc1b2deed
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20754151
Change-Id: I63a0d26d524d005f5d3fa91d8d457950bef86c5b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-22 02:48:06 +00:00
Julien Desprez
6bc1b2deed
Merge changes from topic "presubmit-am-47a13f40ada54c9497aaa1d5e38a931a" into sc-qpr1-dev am: 48c10589c6
am: cd608825a3
am: 50d29f770b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20754151
Change-Id: I1fd20f11bb37a544fb19558d4cbf77571a0bd899
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-22 02:13:17 +00:00
Julien Desprez
50d29f770b
Merge changes from topic "presubmit-am-47a13f40ada54c9497aaa1d5e38a931a" into sc-qpr1-dev am: 48c10589c6
am: cd608825a3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20754151
Change-Id: I660d33b843ad09e5bf51ee326e6dd2250f782148
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-22 01:33:44 +00:00
Treehugger Robot
20d6e731bb
Merge "Update art-host-tests build rule to support partial download" am: 909a5b40a6
am: 50aeb8e735
am: 21eadd9e7a
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2478786
Change-Id: Ifd807dbccb3346b79b6b69d2c02478121f25f8f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-13 20:02:16 +00:00
Treehugger Robot
21eadd9e7a
Merge "Update art-host-tests build rule to support partial download" am: 909a5b40a6
am: 50aeb8e735
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2478786
Change-Id: Ia9c3f495ee959ffc083ad6f9fefd287b2e5d3a9f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-13 19:07:09 +00:00
Presubmit Automerger Backend
fddbfae052
[automerge] Remove tradefed-no-fwk from suites 2p: ca46df5783
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20754150
Ignore-AOSP-First: Cherry pick
Bug: 262597958
Change-Id: I60b254a6fcfff396b88c80c58a17037817bb5bb7
2023-03-09 23:13:53 +00:00
Dan Shi
7c2982ab87
Update art-host-tests build rule to support partial download
...
Bug: 272110734
Test: build
Change-Id: Icd13530a662e7989c6d8cb5c68b95857bdeb7182
2023-03-09 00:16:25 +00:00
Julien Desprez
ca46df5783
Remove tradefed-no-fwk from suites
...
Test: presubmit
Ignore-AOSP-First: Cherry pick
Bug: 262597958
Change-Id: I672533c475362f4438b5aefc108749be4cfc97df
(cherry picked from commit 917acd67c7
)
2023-03-08 18:32:09 +00:00
Joe Onorato
bcf5b6cb46
Merge "Remove OWNERS access for non-build team people to core build system" am: 10bdfb5f23
am: a29a46050a
am: 3dc4c35514
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2460830
Change-Id: Id793fd5ebbbcfd8080bcf22a0f2ef9b851ccf119
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-28 23:42:02 +00:00
Joe Onorato
3dc4c35514
Merge "Remove OWNERS access for non-build team people to core build system" am: 10bdfb5f23
am: a29a46050a
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2460830
Change-Id: Ia1a2478549efd05eac8d2a1325dea31e96adece5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-28 22:44:04 +00:00
Joe Onorato
682f36220b
Remove OWNERS access for non-build team people to core build system
...
Test: treehugger
Change-Id: I578a2902b6d0853fffe4c3513322da4c15300513
2023-02-28 10:52:10 -08:00
Florian Mayer
423f9c4bb8
Merge "driveby: Fix typo" am: 2e39131d80
am: 45f02948a0
am: 4cb1cd1e80
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2449823
Change-Id: Iff4f88c8e4e0f1bf9cbc7b2b3834e2eec5da7e41
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-28 00:50:22 +00:00
Florian Mayer
4cb1cd1e80
Merge "driveby: Fix typo" am: 2e39131d80
am: 45f02948a0
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2449823
Change-Id: I426146aa487ac016ab0421254460a03487468d59
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-28 00:03:30 +00:00
Florian Mayer
5e3f57c2d5
driveby: Fix typo
...
Change-Id: I3aa8a0bdd15d16975b8b630b03590457b8ac9326
2023-02-24 19:34:25 +00:00
Zhenhuang Wang
3c7278593f
Merge "Enable -sha256
feature to device-tests.zip" am: 195b5fc64c
am: c14d68cebe
am: a82b2b5658
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2442621
Change-Id: I1b3ae6107aefbc18142a190a209e12b8b49e43f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-20 10:16:33 +00:00
Zhenhuang Wang
a82b2b5658
Merge "Enable -sha256
feature to device-tests.zip" am: 195b5fc64c
am: c14d68cebe
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2442621
Change-Id: I97d1c57c96a46bf973ea6e40f884b9cacaa7646d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-20 09:05:06 +00:00
Zhenhuang Wang
d1dfcda616
Enable -sha256
feature to device-tests.zip
...
With `-sha256` flag, file header of generated zip files contains
SHA256 checksum for each file, which can then be used by downstream
systems.
Bug: 259513199
Test: m dist device-tests
Change-Id: Id5d2cba9096983da4f4843146a5eaa84393b4880
2023-02-17 17:48:24 +08:00
Zhenhuang Wang
85343655f8
Merge "Revert "Revert "Enable -sha256
feature to some Soong built zip files""" am: 371da61096
am: 963bc9676e
am: 55ed878a74
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2434552
Change-Id: I4c2fc30d1f7dab60557df0a7541ad555d3e212ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-16 04:55:43 +00:00
Zhenhuang Wang
55ed878a74
Merge "Revert "Revert "Enable -sha256
feature to some Soong built zip files""" am: 371da61096
am: 963bc9676e
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2434552
Change-Id: If0e839be1b406f6d8f253a9f87c8be0fad86eeff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-16 03:58:45 +00:00
Zhenhuang Wang
23d8c72472
Revert "Revert "Enable -sha256
feature to some Soong built zip files""
...
This reverts commit 7d8eeec0dd
.
Reason for revert: re-submit the change https://r.android.com/2393272
Change-Id: I6c906a82823a4b69d0cd8a5ce364d802c646cb68
2023-02-14 00:29:30 +00:00
Zhenhuang Wang
045624ea85
Merge "Revert "Enable -sha256
feature to some Soong built zip files"" am: 65ff0460c4
am: 97e73564c3
am: def1100a05
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2430432
Change-Id: Ieee816e874720a88fae431c79470d8ac97a8b24e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-10 16:17:58 +00:00
Zhenhuang Wang
def1100a05
Merge "Revert "Enable -sha256
feature to some Soong built zip files"" am: 65ff0460c4
am: 97e73564c3
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2430432
Change-Id: If36e0842638bd34c67b645bb0e4b4edd868df003
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-10 15:29:50 +00:00
Zhenhuang Wang
7d8eeec0dd
Revert "Enable -sha256
feature to some Soong built zip files"
...
This reverts commit fae06b15ce
.
Reason for revert: Some labs are still not upgraded to the latest version, causing presubmit test flaky.
Bug: 268608699
Bug: 259513199
Change-Id: I05f0fef27afdbbd5350e77616074059b7bf1da42
2023-02-10 14:02:06 +00:00
Zhenhuang Wang
ede5c7217d
Merge "Enable -sha256
feature to some Soong built zip files" am: 9544346d39
am: 5c8213b1bd
am: 354552cfee
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2393272
Change-Id: Ie1d90112c5ed79c70599f6cce0f8d61d8b60c47c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-10 10:03:19 +00:00
Zhenhuang Wang
354552cfee
Merge "Enable -sha256
feature to some Soong built zip files" am: 9544346d39
am: 5c8213b1bd
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2393272
Change-Id: I10f6896ed8d003f143558deb840223155bc8e408
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-10 09:09:33 +00:00
Zhenhuang Wang
fae06b15ce
Enable -sha256
feature to some Soong built zip files
...
Enable the new soong_zip feature to general-tests.zip,
host-unit-tests.zip, android-cts.zip, android-mts.zip etc. This is a
following change of https://r.android.com/2395452 . With `-sha256` flag,
file header of generated zip files contains SHA256 checksum for each
file, which can then be used by downstream systems.
Bug: 259513199
Test: run `m dist host-unit-tests general-tests cts mts` and check zip
files under `out/dist/`
Change-Id: I726b5261d177beadcd8f707e2cd2cb5cdef20273
2023-01-26 13:49:57 +08:00
Duy Truong
880b9e48c8
Merge changes from topic "presubmit-am-f711d019bdbd4e43ab4f32ee30dc96be" into sc-qpr1-dev am: dff3b7e210
am: e82eda2562
am: fc6aa53d53
am: fa4e1c1083
am: 86d92b798d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20950851
Change-Id: Ic8be201357dfe1a8ae494c9d5e47f72e4fb8d689
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-20 12:38:53 +00:00
Duy Truong
31d9a73eef
Merge changes from topic "presubmit-am-f711d019bdbd4e43ab4f32ee30dc96be" into sc-qpr1-dev am: dff3b7e210
am: e82eda2562
am: fc6aa53d53
am: 028f962fd4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20950851
Change-Id: I92ce7bc3280a907f17a992a7923acbfa172074ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-20 11:49:16 +00:00
Duy Truong
028f962fd4
Merge changes from topic "presubmit-am-f711d019bdbd4e43ab4f32ee30dc96be" into sc-qpr1-dev am: dff3b7e210
am: e82eda2562
am: fc6aa53d53
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20950851
Change-Id: Ib11e135c591d9203868e49e31819d985074a0af2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-20 11:15:52 +00:00
Duy Truong
fc6aa53d53
Merge changes from topic "presubmit-am-f711d019bdbd4e43ab4f32ee30dc96be" into sc-qpr1-dev am: dff3b7e210
am: e82eda2562
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20950851
Change-Id: I7aff25a009ee1804cc3aafe4d783937a5d12d6d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-20 10:09:01 +00:00
Presubmit Automerger Backend
6ee3acaf90
[automerge] Include JDK with STS SDK like the other *TS suites. 2p: 3c1caa29b8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20950851
Bug: 238373261
Change-Id: Id6c008dadec007999d0e7a58f5d5d52f95749a45
2023-01-18 23:02:39 +00:00
Duy Truong
3c1caa29b8
Include JDK with STS SDK like the other *TS suites.
...
Bug: 238373261
Test: Build and run STS SDK sample
Change-Id: I7378a555393e4194917083197829201320e595b4
2023-01-18 23:02:31 +00:00
Treehugger Robot
21e0338f21
Merge "Resubmit: Initial add wvts to build" am: e473190d52
am: a7d2cc7d0a
am: 6bb7a5916b
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2383292
Change-Id: I8f4f788447baa1f52e49bb11dceeafd3a00f51d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-18 02:12:21 +00:00
Robert Shih
1b73bfbd97
Resubmit: Initial add wvts to build
...
[ Merge of pa/2264578 ]
Test: make wvts
Bug: 209663123
Change-Id: If1382ed06a93bc34d327ee88bf46ff290e84f786
2023-01-11 00:55:50 +00:00
Dan Sinkiewicz
d475e99deb
Merge "Revert "Initial add wvts to build"" am: e61203da9c
am: 6946b25e3d
am: 77e2b1d7dd
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2382972
Change-Id: I9373282ac961c40f4b13536bc8c9d9548cba1e9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-10 20:58:45 +00:00
Robert Shih
9964162ae8
Merge "Initial add wvts to build" am: 0f8236bb24
am: 8d6ebee56b
am: 1079601afa
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2374652
Change-Id: I458176f4e3bfcc4e29b2fb8b99a96029540e07e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-10 20:56:52 +00:00
Robert Shih
57fe3f6041
Revert "Initial add wvts to build"
...
This reverts commit 588f2e62da
.
Reason for revert: b/265032293
Change-Id: I6a9dd24cfef2256288170f5bf59d24604f05d4d2
2023-01-10 18:51:18 +00:00
Robert Shih
588f2e62da
Initial add wvts to build
...
[ Merge of pa/2264578 ]
Test: make wvts
Bug: 209663123
Change-Id: I089fcdfc385e9d01aa275f77a566ffecb5340495
2023-01-08 03:38:11 +00:00
Treehugger Robot
f73b9d7afa
Merge "Revert "Define vendor-hwasan-snapshot target"" am: 0ffb3e522e
am: c3dbecdc07
am: e8070b62e4
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2373468
Change-Id: I34fbf5cc519991b497480437b119e407b5af3591
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-03 19:06:42 +00:00
Justin Yun
3ddd9f49e2
Revert "Define vendor-hwasan-snapshot target"
...
This reverts commit 97c140ccad
.
As vsdk can capture hwasan snapshot with aosp/2358699, we don't need
this workaround any more.
Bug: 234772527
Test: TH
Change-Id: I94e751949d679a31060bb5fea0147947fc6682f4
2023-01-02 16:07:43 +09:00
Justin Yun
ec6e245f53
Merge "Add missing target from makefile" am: 857260905b
am: 7c8ea9d79a
am: a0bd05639e
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2372088
Change-Id: I78d660d52a94a5204428fbccceedbb17c558f9ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-02 05:28:52 +00:00