Commit graph

2718 commits

Author SHA1 Message Date
Spandan Das
4adcf84808 Conditional inclusion of blueprint modules
Bug: 270654958

This introduces a new `blueprint_package_includes` module type. If
present, other blueprint modules in that file will be analyzed
if and only if the requested include tags are met

example syntax:
```
Android.bp
blueprint_packgage_includes {
  match_all: ["tag1", "tag2", ...],
}

other_module1 {...}
other_module2 {...}
```
other_module1 and other_module2 will not be analyzed unless
tag1,tag2, ... are set

This also adds a new object of type `IncludeTags` to the Context object,
which is a container for these string keys.

Test: In build/blueprint, go test ./
Test: TH

Change-Id: I79de0d7da3224a5b2025c27a5137f39d00c7382e
Merged-In: I79de0d7da3224a5b2025c27a5137f39d00c7382e
(cherry picked from commit fd1f976100fb78d50902bd6feb550e92f70fa962)
2023-03-15 22:13:04 +00:00
Cole Faust
9c1d8543c8 Merge "Fix error messages not printing names" am: 2ed895448b am: ef778a12ac am: a18bf4dacb
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2477772

Change-Id: I6263a468a38b59cbb749c73104abf363fc7d9396
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-09 01:39:14 +00:00
Cole Faust
a18bf4dacb Merge "Fix error messages not printing names" am: 2ed895448b am: ef778a12ac
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2477772

Change-Id: Ib3a3e6467e08d20aff773f2df555a63dbbcd4b1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-09 01:04:08 +00:00
Cole Faust
ef778a12ac Merge "Fix error messages not printing names" am: 2ed895448b
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2477772

Change-Id: I24c36250b68c7b69363d450e1016eac82f2fc3ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-09 00:29:28 +00:00
Cole Faust
2ed895448b Merge "Fix error messages not printing names" 2023-03-08 23:57:31 +00:00
Cole Faust
ff87a5128b Fix error messages not printing names
Bug: 271424349
Test: Presubmits
Change-Id: I8dd6ab7109c29bd8a03fd2f898eebe1a50a28914
2023-03-08 11:53:24 -08:00
Usta Shrestha
90b54a230c Use phony ninja outputs to reduce file-size am: 2bae13b095 am: 80d4d41953 am: ff1beefbb9
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2449271

Change-Id: Ifda26860468279be849402b77fa9b99154eab4cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 17:41:50 +00:00
Usta Shrestha
ff1beefbb9 Use phony ninja outputs to reduce file-size am: 2bae13b095 am: 80d4d41953
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2449271

Change-Id: I53bfafbf9025e6fb3c0f7ba8635cd85b14b89c0a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 17:06:47 +00:00
Usta Shrestha
80d4d41953 Use phony ninja outputs to reduce file-size am: 2bae13b095
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2449271

Change-Id: Id6d6187eef662ab628c268caa9b26391df075da5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 16:30:56 +00:00
Usta Shrestha
2bae13b095 Use phony ninja outputs to reduce file-size
1. scan if any set of order-only deps are repeated
  2. if so extract them as a phony output to be shared

Test: m libc
Bug: NA
Change-Id: I0689111b97bbbd1f3b26650e8ae2e0a4ffb5085e
2023-03-07 01:39:27 -05:00
Kevin Dagostino
7613e68b09 Enable parallelCompile since golang is now >= 1.9 am: ad7bcc7b50 am: 0ce4909fd2 am: bcdf8aceda
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2469723

Change-Id: I82241c96e3a549a81cbfb016cb31ac9f569454d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-06 19:12:15 +00:00
Kevin Dagostino
bcdf8aceda Enable parallelCompile since golang is now >= 1.9 am: ad7bcc7b50 am: 0ce4909fd2
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2469723

Change-Id: I0c1435a7800432bef5365ec506e9d88f9afb1691
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-06 18:34:50 +00:00
Kevin Dagostino
0ce4909fd2 Enable parallelCompile since golang is now >= 1.9 am: ad7bcc7b50
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2469723

Change-Id: If58146bc8c54081ee318362f33a79db8cfbd51f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-06 18:00:20 +00:00
Kevin Dagostino
ad7bcc7b50 Enable parallelCompile since golang is now >= 1.9
Test: m nothing
Change-Id: I38cdd83ca9b17263155433abb65fb4f97b5ec70b
2023-03-03 21:57:29 +00:00
Usta Shrestha
d56dd996a3 cosmetic: readability am: 4cff07db25 am: 35136c7d74 am: f1f0a2b86d
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2449269

Change-Id: I3f33cbe955e6131dbd18ae05596dcf8772305b37
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-02 06:20:50 +00:00
Usta Shrestha
f1f0a2b86d cosmetic: readability am: 4cff07db25 am: 35136c7d74
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2449269

Change-Id: I18cd8103f3ef6732758ae2f30d30421057a3f916
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-02 05:41:10 +00:00
Usta Shrestha
35136c7d74 cosmetic: readability am: 4cff07db25
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2449269

Change-Id: I90f60e52e43528e26681278244bccb8667675444
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-02 05:07:10 +00:00
Usta Shrestha
ea06372da3 Add unit test for EventHandler am: 3e334cfed2 am: 66a29aefa0 am: db79b843ca
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2458548

Change-Id: I872087d0dfc3c3c82044a865683c5e6d4090e4de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-28 21:44:04 +00:00
Usta Shrestha
db79b843ca Add unit test for EventHandler am: 3e334cfed2 am: 66a29aefa0
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2458548

Change-Id: I67314a9444b805d6ce4ce75df34c33fc20cdeb6e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-28 21:09:54 +00:00
Usta Shrestha
66a29aefa0 Add unit test for EventHandler am: 3e334cfed2
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2458548

Change-Id: I18705ae924814febb401af5e447920ea507bcaf0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-28 19:35:06 +00:00
Usta Shrestha
4cff07db25 cosmetic: readability
Test: run `m nothing`
Bug: NA
Change-Id: Id58635cc949f07e5263ad67b0e78c66d19abba40
2023-02-27 11:41:51 -05:00
Usta Shrestha
3e334cfed2 Add unit test for EventHandler
Test: the added file
Bug: NA
Change-Id: Id50105e84585348ce8540f52407224daeb8eb0d4
2023-02-27 11:41:51 -05:00
Treehugger Robot
0afb4effc0 Merge "cosmetic: use _ for unused args" am: 1821351760 am: a50172080b am: fda564250b
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2449270

Change-Id: I01547574c2d0df616212a34dc3538a1331d73633
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-23 20:54:33 +00:00
Usta Shrestha
c3d49aa6ae cosmetic: readability am: ce85ecb176 am: 2833cebfa2 am: a694aae313
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2444579

Change-Id: Ib1683f7f3e323ca24be9bbadd890323ab207e3b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-23 20:53:41 +00:00
Treehugger Robot
fda564250b Merge "cosmetic: use _ for unused args" am: 1821351760 am: a50172080b
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2449270

Change-Id: Ie3116892134a58d548fccb79b77542425b6797cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-23 19:52:07 +00:00
Usta Shrestha
a694aae313 cosmetic: readability am: ce85ecb176 am: 2833cebfa2
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2444579

Change-Id: I22681f6bad2beeb46cbce2f1951e89d6c53e0e96
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-23 19:50:15 +00:00
Treehugger Robot
a50172080b Merge "cosmetic: use _ for unused args" am: 1821351760
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2449270

Change-Id: I57324caea1736d8b4c6e95c2956caacd5b53f1c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-23 19:46:21 +00:00
Usta Shrestha
2833cebfa2 cosmetic: readability am: ce85ecb176
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2444579

Change-Id: I4772e567093cace606edcdb6fe486dacbd92ed4b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-23 19:14:04 +00:00
Treehugger Robot
1821351760 Merge "cosmetic: use _ for unused args" 2023-02-23 16:21:18 +00:00
Usta Shrestha
7f3c51ca43 cosmetic: use _ for unused args
Test: run `m nothing`
Bug: NA
Change-Id: Idfdb0d4121244e25847822114a2d12c6bb18ebd1
2023-02-23 02:28:12 +00:00
Usta Shrestha
ce85ecb176 cosmetic: readability
Test: run `m nothing` and `m nothing --empty_ninja_file`
Bug: NA
Change-Id: I6fd81667ea2d636139ae38bc36315f8710b72c25
2023-02-23 02:27:26 +00:00
Sam Delmerico
459cb61263 apply gofmt am: 26e44b7b78 am: 112f8ce34f am: 4373a40e61
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2448682

Change-Id: I54688b85fc38c321be2288cc404dddae36461461
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-22 18:02:35 +00:00
Sam Delmerico
4373a40e61 apply gofmt am: 26e44b7b78 am: 112f8ce34f
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2448682

Change-Id: I0826f298f1dc436acfad17d451b9607ae07f1257
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-22 16:46:02 +00:00
Sam Delmerico
112f8ce34f apply gofmt am: 26e44b7b78
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2448682

Change-Id: I9627ededb4270842ccc5f205b720c002c30c52a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-22 15:43:22 +00:00
Sam Delmerico
26e44b7b78 apply gofmt
Change-Id: I2416e246b3d8485a6b7810b998cff2f45f6a0494
2023-02-21 15:11:20 -05:00
Liz Kammer
c869b2f2f4 Add event handler for each mutator am: a988f08000 am: 01fb1d4c41 am: becc2f6a3e
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2432532

Change-Id: I6319daf46aac511ee6c5dece56971674f3a134ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-14 21:50:58 +00:00
Liz Kammer
b5cb3d0c7b Add getter for EventHandler so its easier to mock am: 073f69d723 am: addb326e69 am: c2e79cbc36
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2434332

Change-Id: I4da2738ecc0a459ed96d364fbf20019c6c20d059
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-14 21:45:16 +00:00
Liz Kammer
becc2f6a3e Add event handler for each mutator am: a988f08000 am: 01fb1d4c41
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2432532

Change-Id: Ib9b6f0db5dd408a48acddb634b1889403405afc3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-14 20:42:40 +00:00
Liz Kammer
c2e79cbc36 Add getter for EventHandler so its easier to mock am: 073f69d723 am: addb326e69
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2434332

Change-Id: I1a174c90e1d7f7e59f05677cf29363e6320ed9ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-14 20:40:40 +00:00
Liz Kammer
01fb1d4c41 Add event handler for each mutator am: a988f08000
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2432532

Change-Id: I977d86f07f9d68534e2f1714379e0882d74b8b48
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-14 19:53:24 +00:00
Liz Kammer
addb326e69 Add getter for EventHandler so its easier to mock am: 073f69d723
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2434332

Change-Id: I5623fa879897e896ba1762172bd0b1a0dc6addf7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-14 19:51:29 +00:00
Liz Kammer
a988f08000 Add event handler for each mutator
Collect additional metrics for individual mutators in order to
understand impact of individual mutators.

Test: m nothing
Change-Id: Ic3ecb1e79a79dd665c9f60d29f0dfd3732481c2d
2023-02-13 18:02:23 -05:00
Liz Kammer
073f69d723 Add getter for EventHandler so its easier to mock
Test: m nothing
Change-Id: Ied338a25f12404ddc88c3b3cb7d7f2ff9ade3aab
2023-02-13 18:02:22 -05:00
Chris Parsons
d6d14057b4 Close ninja file descriptor am: 58a29728ea am: 33d423ce03 am: c7a2ba54bf
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2428033

Change-Id: I2df73f9719ec9a26aa01012e3ce7184e3104265b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-09 21:02:17 +00:00
Chris Parsons
c7a2ba54bf Close ninja file descriptor am: 58a29728ea am: 33d423ce03
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2428033

Change-Id: I652b2701a72de7198553766f90ae396828214103
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-09 19:07:25 +00:00
Chris Parsons
33d423ce03 Close ninja file descriptor am: 58a29728ea
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2428033

Change-Id: I47bb7ac1f2628b3aed73491d71ab0415edfe4654
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-09 17:45:29 +00:00
Chris Parsons
58a29728ea Close ninja file descriptor
With this close() missing, especially with large ninja files, soong paid
the runtime cost at arbitrary times during the rest of its execution (or
during process cleanup).

Test: Manual runs of `m nothing` and verifying timing metrics
Change-Id: Ibdfbf7371cfc4c58c485e76f96b8e9b9ad900972
2023-02-08 23:33:56 -05:00
Cole Faust
8048715429 Show the ninja string that failed to parse in errors am: c5baf11a2d am: c03d43564a am: d7cd87ae92
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2393625

Change-Id: I0377eed81e23f654514c8ea7869ee96bd2bca557
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-20 01:30:49 +00:00
Cole Faust
d7cd87ae92 Show the ninja string that failed to parse in errors am: c5baf11a2d am: c03d43564a
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2393625

Change-Id: I09c15bd36805c6679d7ca2ce05029e5bdcd25d5b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-20 00:55:44 +00:00
Cole Faust
c03d43564a Show the ninja string that failed to parse in errors am: c5baf11a2d
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2393625

Change-Id: Ie6c2eac046adda1bd4a2a57c33658fdc8c6b01a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-20 00:21:49 +00:00