Commit Graph

1127 Commits

Author SHA1 Message Date
Colin Cross
1b7f072505 Remove obsolete ide.mk and related code
The code to generate an eclipse classpath is obsolete, remove it and
related code.

Test: no change to out/build-aosp_cf_x86_64_phone.ninja
Change-Id: I7e1b6268b98ecbb7be88db8945dd7b30acc695ba
2023-11-02 10:16:57 -07:00
Jeff Hamilton
426a9f8f02 Move most version variable out to relase configs.
This allows finer control of the version variables
per release config, and removes a lot of computed
logic in favor of just directly setting the values.

Bug: 306702353
Test: lunch <device>-next-userdebug && m -j98
Change-Id: I9edc7171d124f0cfa540fea6f0e06ba877910444
Ignore-AOSP-First: Changes in internal projects first.
Merged-In: I9edc7171d124f0cfa540fea6f0e06ba877910444
2023-10-24 16:41:58 +00:00
Edward Liaw
a06534686f Merge "linux-kselftest: Remove special cased build rule for kselftest" into main am: 41d4b0b3af
Original change: https://android-review.googlesource.com/c/platform/build/+/2736953

Change-Id: Ia5a3c3ed37738c58404dc7a9ea78d74bd509ead2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-05 01:48:39 +00:00
Edward Liaw
41d4b0b3af Merge "linux-kselftest: Remove special cased build rule for kselftest" into main 2023-10-05 01:08:32 +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
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
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
e029e1e7ba Merge "Add test utils script to xTS zips" 2023-07-05 17:23:30 +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
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
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
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
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
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
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