1271 Commits

Author SHA1 Message Date
Jeongik Cha
05210f96b3 BUILD_NUMBER and BUILD_HOSTNAME doesn't affect kati regeneration
* Extract BUILD_NUMBER, BUILD_HOSTNAME to file to avoid kati change
* Handle FILE_NAME_TAG_PLACEHOLDER string in dist in build/make/packaging/distdir.mk

Test: check if kati isn't invoked even though BUILD_NUMBER, BUILD_HOSTNAME
  is changed
Test: m && m, and check if the second m is no-op
Bug: 278060169
Change-Id: I1b37760242853c1a145bad255d0bb15524234b25
Merged-In: I1b37760242853c1a145bad255d0bb15524234b25
2023-05-23 07:14:22 +09:00
Jeongik Cha
7b40aa8338 BUILD_NUMBER and BUILD_HOSTNAME doesn't affect kati regeneration
* Extract BUILD_NUMBER, BUILD_HOSTNAME to file to avoid kati change
* Handle FILE_NAME_TAG_PLACEHOLDER string in dist in build/make/packaging/distdir.mk

Ignore-AOSP-First: there are internal use cases of FILE_NAME_TAG
Test: check if kati isn't invoked even though BUILD_NUMBER, BUILD_HOSTNAME
  is changed
Test: m && m, and check if the second m is no-op
Bug: 278060169
Change-Id: I1b37760242853c1a145bad255d0bb15524234b25
2023-05-22 15:50:16 +09:00
Treehugger Robot
337642bf31 Merge "Remove gpl_source.tgz" am: 48a8afe677 am: 0d73e67d39 am: b3d5d43b15 am: cb424db193 am: 98aae0b489 am: ffb275b6d1
Original change: https://android-review.googlesource.com/c/platform/build/+/2584219

Change-Id: I5fb901636f143584aca1dad8fecea9ac5fa1c324
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-16 01:50:21 +00:00
Treehugger Robot
cb424db193 Merge "Remove gpl_source.tgz" am: 48a8afe677 am: 0d73e67d39 am: b3d5d43b15
Original change: https://android-review.googlesource.com/c/platform/build/+/2584219

Change-Id: Ic20b2515ee2f3c81d9a80827f6fb1bd0d9bf6e27
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-15 23:36:59 +00:00
Treehugger Robot
0d73e67d39 Merge "Remove gpl_source.tgz" am: 48a8afe677
Original change: https://android-review.googlesource.com/c/platform/build/+/2584219

Change-Id: I9db9146283f4775281a1c049c1f15a17f74d818d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-15 22:10:55 +00:00
Treehugger Robot
48a8afe677 Merge "Remove gpl_source.tgz" 2023-05-15 21:36:32 +00:00
Treehugger Robot
3b7bde8df1 Merge "Only search for test suite jdk files once" am: 6961b14269 am: e72f71968a am: 7de4d04c10 am: dba7b2e967 am: 671a42e448 am: e18dc8954e
Original change: https://android-review.googlesource.com/c/platform/build/+/2585683

Change-Id: I125fd43bad61bdaccf373de2c3b7f57e1cf65a30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 09:14:08 +00:00
Treehugger Robot
dba7b2e967 Merge "Only search for test suite jdk files once" am: 6961b14269 am: e72f71968a am: 7de4d04c10
Original change: https://android-review.googlesource.com/c/platform/build/+/2585683

Change-Id: I1dd51d6b64e045fa2a6a38432c70357cfec9539b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 07:49:20 +00:00
Treehugger Robot
e72f71968a Merge "Only search for test suite jdk files once" am: 6961b14269
Original change: https://android-review.googlesource.com/c/platform/build/+/2585683

Change-Id: I8102ee297fbba527a6e997bc939681ec407e0b0d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 06:23:53 +00:00
Cole Faust
a5f31a5820 Only search for test suite jdk files once
compatibility.mk is included 33 times on aosp, and 47 times on
internal master. Each of these would run this shell command, and
there would be an entry in the kati stamp file for each time it was
run, causing this command to be run the 33/47 times every single build.
This took ~0.2 seconds, which can be saved by only running it once.
(However these ~0.2 seconds are parallelized with other parts of the
stamp checking)

Bug: 282079550
Test: m nothing
Change-Id: I364836d1cb0cc26ca9116eda6d954170e1cb7761
2023-05-11 18:22:03 -07:00
Cole Faust
ab4f856bbc Remove gpl_source.tgz
This file was an archive of all the gpl files that could be found
in the source tree. Because it looks for gpl files using $(wildcard),
kati had to rerun the wildcards every single build to see if they had
changed. These GPL wildcards made up 30294 of 63996 wildcards present
on aosp-master. Removing these wildcards saves (aosp/internal) ~0.2/~0.1
seconds from every build, and ~0.4/~0.6 seconds from the wildcard
checking portion of kati. (The whole build sees <0.4s/0.6s of
improvement because it's parallelized with the shell checking, but
improvements here mean that we can now improve the shell commands as
well and get more fruitful results)

We don't actually use gpl_source.tgz anywhere, so we can just remove it.

Bug: 282079550
Test: m nothing
Change-Id: I77141dbb39b2d8ebd96bc258fe7dbdff5a372977
2023-05-11 18:00:38 -07:00
Julien Desprez
fdb4c04c29 Merge "Revert "Add Traefed Contrib to CATBox"" into udc-dev am: 372c3d6be5 am: 7f101e4474 am: a589cbf3aa am: e01ad15643
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/22972381

Change-Id: I05ee8c738a5953d6a62de50ac5d36499c95c53fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 04:50:13 +00:00
Julien Desprez
e01ad15643 Merge "Revert "Add Traefed Contrib to CATBox"" into udc-dev am: 372c3d6be5 am: 7f101e4474 am: a589cbf3aa
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/22972381

Change-Id: I58d0b92eb5fbbe41323b483ed9bdc99ac82bcd78
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 23:25:09 +00:00
Julien Desprez
1192b6fdfe Merge "Revert "Add Traefed Contrib to CATBox"" into udc-dev am: 372c3d6be5
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/22972381

Change-Id: I209ae0bd89718d2b8ab11b7372671f89888e1e1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-03 21:48:45 +00:00
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
Julien Desprez
85bb58b5f8 Merge "Remove jars from suites that aren't used" am: 283e59bf2d am: f268c6ddd1 am: 2c5b00fbdd am: e50889f274 am: 78a223d4be
Original change: https://android-review.googlesource.com/c/platform/build/+/2563330

Change-Id: I3d53c02cc5d73c0f2daa9481f3080074d6882ce7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-28 00:10:58 +00:00
Julien Desprez
e50889f274 Merge "Remove jars from suites that aren't used" am: 283e59bf2d am: f268c6ddd1 am: 2c5b00fbdd
Original change: https://android-review.googlesource.com/c/platform/build/+/2563330

Change-Id: I4abada5946d6e4495d35d673c5bd9fe4ad033001
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-27 16:57:22 +00:00
Julien Desprez
f268c6ddd1 Merge "Remove jars from suites that aren't used" am: 283e59bf2d
Original change: https://android-review.googlesource.com/c/platform/build/+/2563330

Change-Id: Ibb2cdbef8dfb72a22aec8f3efeabe0564c905cdf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-26 16:04:34 +00:00
Julien Desprez
ebe62658ed Remove jars from suites that aren't used
Test: presubmit
Bug: 279638202
Change-Id: I01ea97bee5c9502eebda7e09eb617854e1aaf1a8
2023-04-26 01:29:13 +00:00
Julien Desprez
5fc7314a51 Remove tradefed-no-fwk from suites
Test: presubmit
Bug: 262597958
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:917acd67c736894551537c52f8eebc4ab8f96b95)
Merged-In: I672533c475362f4438b5aefc108749be4cfc97df
Change-Id: I672533c475362f4438b5aefc108749be4cfc97df
2023-04-25 20:55:31 +00:00
Treehugger Robot
dea4dae0c1 Merge "add PRODUCT_SOURCE_ROOT_DIRS product variable" am: d67a345f9a am: 2e5dfd6a0b am: 1045e6e398 am: 188fdcd405 am: 0e9834fb61
Original change: https://android-review.googlesource.com/c/platform/build/+/2448662

Change-Id: I5a115432d165ac7544c7f667ab4afe004ef717f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-30 23:23:28 +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
b2ec1f0ee3 Merge "Don't read test mapping list in Make" am: 2feb102e4d am: 4979af18b9 am: 99a26d0bfd am: 7d9504703a am: 868a13368d
Original change: https://android-review.googlesource.com/c/platform/build/+/2506833

Change-Id: I9a861fe72e1e6fc19e2881681699dda47b9cd9ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-24 18:41:55 +00: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
fc2852604c Merge "Update art-host-tests build rule to support partial download" am: 909a5b40a6 am: 50aeb8e735 am: 21eadd9e7a am: 20d6e731bb am: 55dc210d48
Original change: https://android-review.googlesource.com/c/platform/build/+/2478786

Change-Id: I8a40543943eeeb6fbc8615893896379f4a6939d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-13 20:39:59 +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
Julien Desprez
afb1d12f9d Merge "Remove tradefed-no-fwk from suites" 2023-03-08 01:18:52 +00:00
Joe Onorato
7af6cde6ca Merge "Remove OWNERS access for non-build team people to core build system" am: 10bdfb5f23 am: a29a46050a am: 3dc4c35514 am: bcf5b6cb46 am: 40f188906c
Original change: https://android-review.googlesource.com/c/platform/build/+/2460830

Change-Id: I4222fc0d040b54ff7938d91322564f8d6b018e07
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01 01:31:12 +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
ba67ebbd3d Merge "driveby: Fix typo" am: 2e39131d80 am: 45f02948a0 am: 4cb1cd1e80 am: 423f9c4bb8 am: 7586a5601a
Original change: https://android-review.googlesource.com/c/platform/build/+/2449823

Change-Id: I7ea2b1a0a9e4cf6c455ce6b2cf6a3edb390481df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-28 02:02:04 +00: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
kgui
1c8def4b00 Support collecting static code coverage data for all CTS-V APPs.
An example coverage xml file is /cns/md-d/home/android-tooltopia-metrics-dremel/combined-coverage.xml.

Bug: 270120253

Test: m cts-combined-xml-coverage locally verifies that the APPs are included.

Change-Id: If013938d1b6a869e4a0d0dff62296bd4a218ed7c
2023-02-22 15:31:36 +08: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