Commit Graph

1247 Commits

Author SHA1 Message Date
Treehugger Robot
70948c50f4 Merge "Delete staging directory after creating module package zip" into main am: 517308b890 am: 5a5685a6a9 am: 4ed24d84ed am: 8191024e42 am: 0da0f0a2ec
Original change: https://android-review.googlesource.com/c/platform/build/+/2767637

Change-Id: I5aa8a6ef92d244367896610aedcff01970f095f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-30 06:14:49 +00:00
Treehugger Robot
5a5685a6a9 Merge "Delete staging directory after creating module package zip" into main am: 517308b890
Original change: https://android-review.googlesource.com/c/platform/build/+/2767637

Change-Id: I560705e092b2ee8d0e0a5b5ed6786b9aa307dff8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-30 02:02:18 +00:00
Colin Cross
585967c08a Delete staging directory after creating module package zip
The staging directory isn't used after the module packaging zip is
built.  Delete the staging directory to reduce disk usage without
affecting incremental build performance.

Bug: 302573555
Change-Id: I377c60714f78760d0b6c2588935c12e10a9ed224
Test: treehugger
2023-09-30 00:37:38 +00:00
Edward Liaw
ba282927bf linux-kselftest: Remove special cased build rule for kselftest
Bug: 277261121
Bug: 293945424
Test: m vts
Change-Id: I1c5992730958645e96037fa01a5c110cf410753b
Signed-off-by: Edward Liaw <edliaw@google.com>
2023-09-15 22:49:17 +00:00
Xin Li
be1435290d Merge Android U (ab/10368041)
Bug: 291102124
Merged-In: If9360ebd0acebe85f42f89a268c316d51c765708
Change-Id: I58470464a3239a2ad8e82e4821bb27a2892a8302
2023-08-25 13:25:26 -07:00
Treehugger Robot
a13966114b Merge "Don't check the codename for REL configuration." into main am: 987e6ba3f2 am: 9488c6c0ea am: ba0e5d4f76 am: f9b8392ee3 am: beabe0f42f
Original change: https://android-review.googlesource.com/c/platform/build/+/2717722

Change-Id: I362409c5b9f93cdcb7ca20ccd79781acf02e60b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-20 01:55:15 +00:00
Treehugger Robot
ba0e5d4f76 Merge "Don't check the codename for REL configuration." into main am: 987e6ba3f2 am: 9488c6c0ea
Original change: https://android-review.googlesource.com/c/platform/build/+/2717722

Change-Id: I5087fc66f4e5b3a9b49456760b7113e4ab03a2d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-20 00:13:32 +00:00
Alex Buynytskyy
be87e19e67 Don't check the codename for REL configuration.
Bug: 294161396
Test: m
Change-Id: I905801fdb6520b430f15f219ae4cd89be74065a5
2023-08-19 00:07:16 +00:00
LaMont Jones
0e4634643a Merge changes from topic "mod-info-foreach" into main am: e75c063d1f am: 4bbf7a86af am: 53ddfdb0f2 am: ae970ba410 am: bb93615198
Original change: https://android-review.googlesource.com/c/platform/build/+/2617522

Change-Id: Ieb2b8dcc21af8938c69e8b3f1550b379951eb59a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-14 03:12:38 +00:00
LaMont Jones
53ddfdb0f2 Merge changes from topic "mod-info-foreach" into main am: e75c063d1f am: 4bbf7a86af
Original change: https://android-review.googlesource.com/c/platform/build/+/2617522

Change-Id: If6d6a995bcb3496f65b0378e98afe2ecaed34758
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-14 01:22:53 +00:00
LaMont Jones
3a9ce1d6ea Reduce spaces in module-info.json
Test: manual, presubmit
Change-Id: I79b94206d636b3ac1f4e88eca514057e4613cbfa
2023-07-12 23:17:05 +00:00
LaMont Jones
edc62e8ffe use KATI_foreach_sep in module-info.json rules
Test: manual, presubmit
Change-Id: I0be472cd5c35eeb8f44c7b9184d961d975f6137a
2023-07-12 23:17:05 +00:00
Sorin Basca
806c230233 Merge "Add test utils script to xTS zips" am: e029e1e7ba am: f32074304e am: 35ff4ec982 am: 10738e13c6 am: 09dd9c9b41 am: c7e61b3ba4
Original change: https://android-review.googlesource.com/c/platform/build/+/2361760

Change-Id: I9c7cb525b5b74b163f21eea1e522cb7b56c696a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-06 00:30:46 +00:00
Sorin Basca
10738e13c6 Merge "Add test utils script to xTS zips" am: e029e1e7ba am: f32074304e am: 35ff4ec982
Original change: https://android-review.googlesource.com/c/platform/build/+/2361760

Change-Id: I9dd62248447361166243e3877efbed9863056bc5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-05 19:35:35 +00:00
Sorin Basca
e029e1e7ba Merge "Add test utils script to xTS zips" 2023-07-05 17:23:30 +00:00
Treehugger Robot
f480fdeaa7 Merge "add sha256 to art-host-tests zip to lower rbe upload overhead" am: 6d2b198f87 am: dad161c5e8 am: ae9d03e612 am: b124890786 am: f5918af272 am: 52c01dc13c
Original change: https://android-review.googlesource.com/c/platform/build/+/2640232

Change-Id: I34263c47e866194144323ade275e6138533e7fdd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-29 10:13:09 +00:00
Treehugger Robot
b124890786 Merge "add sha256 to art-host-tests zip to lower rbe upload overhead" am: 6d2b198f87 am: dad161c5e8 am: ae9d03e612
Original change: https://android-review.googlesource.com/c/platform/build/+/2640232

Change-Id: Ie2cd053895edbaadc23bcf05014844004a9404de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-29 07:59:03 +00:00
Julien Desprez
7b94cc7170 add sha256 to art-host-tests zip to lower rbe upload overhead
Avoid a cas unzip/upload by using the soong_zip option

Change-Id: I4ef8571a43ccf49d01e876605759e82f8e87dbc5
Test: presubmit
Bug: 286959075
2023-06-29 00:18:38 +00:00
Sorin Basca
b5a59eaf22 Add test utils script to xTS zips
Test: m cts && unzip android-cts.zip && ./cts-trafed
Change-Id: Iee05bdb03e949eb2f70c9f754190242bc47e5f4e
2023-06-27 19:46:00 +01:00
Devin Moore
b9f1d73857 Merge "Add static_libs to module-info.json" am: b1bae84508 am: 32267a425f am: 4211e25233 am: bdce6803a2 am: 6c3a379a2e am: 522302a97e
Original change: https://android-review.googlesource.com/c/platform/build/+/2590127

Change-Id: I42eb674277960edbd79c9170faac98b6275286c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-06 19:44:39 +00:00
Devin Moore
bdce6803a2 Merge "Add static_libs to module-info.json" am: b1bae84508 am: 32267a425f am: 4211e25233
Original change: https://android-review.googlesource.com/c/platform/build/+/2590127

Change-Id: I93fe105315ca283210b1cd156c4e77fbe3c023b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-06 17:40:54 +00:00
Devin Moore
32267a425f Merge "Add static_libs to module-info.json" am: b1bae84508
Original change: https://android-review.googlesource.com/c/platform/build/+/2590127

Change-Id: I998c016d06dfd67ab09501898ebd4e1b2ab23f5e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-06 16:13:09 +00:00
Devin Moore
48d7b3462d Add static_libs to module-info.json
This is helpful for analyzing how often a library is included statically
on a device. If a large library is linked statically in many processes
in a single device, it may be a good candidate for shared linking
instead.

This increases the size of module-info.json file on Cuttlefish by ~12.5%
from 65MB to 72MB.

Test: m
Bug: 280829178
Change-Id: I3614d86d799810e1ce845e1097f43f1ec0a412a3
2023-06-05 20:17:50 +00:00
Jeongik Cha
f295008821 BUILD_NUMBER and BUILD_HOSTNAME doesn't affect kati regeneration am: 05210f96b3
Original change: https://android-review.googlesource.com/c/platform/build/+/2563995

Change-Id: Ieaa619837f1c212265075ea59ddc74be34afd783
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-23 09:28:02 +00:00
Jeongik Cha
43aaa8989e BUILD_NUMBER and BUILD_HOSTNAME doesn't affect kati regeneration am: d0b037235d
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23378947

Change-Id: I0fef5b60fe9f2aeeff7d09b55901782f3fcd8df2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-23 02:07:17 +00:00
Jeongik Cha
d0b037235d 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
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:7b40aa8338ba85a58ee481fe6bafac2959f7112b)
Merged-In: I1b37760242853c1a145bad255d0bb15524234b25
Change-Id: I1b37760242853c1a145bad255d0bb15524234b25
2023-05-22 22:42:07 +00:00
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