Commit graph

2791 commits

Author SHA1 Message Date
Treehugger Robot
904ee8bc8a Merge "ignore bp files from PRODUCT_SOURCE_ROOT_DIRS" am: 82aa0ffb51 am: 2451597ebe am: b4a2d1622d
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2448683

Change-Id: Ie062f43b96abbaa58a9ff85a84842d07f470008b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-30 17:42:35 +00:00
Treehugger Robot
b4a2d1622d Merge "ignore bp files from PRODUCT_SOURCE_ROOT_DIRS" am: 82aa0ffb51 am: 2451597ebe
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2448683

Change-Id: Ic2d979830665783b0083046cb08dfff893b359f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-30 17:34:10 +00:00
Treehugger Robot
2451597ebe Merge "ignore bp files from PRODUCT_SOURCE_ROOT_DIRS" am: 82aa0ffb51
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2448683

Change-Id: I040413f5dcf4e121b8be52cdad3ea6f87403867c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-30 17:02:33 +00:00
Treehugger Robot
82aa0ffb51 Merge "ignore bp files from PRODUCT_SOURCE_ROOT_DIRS" 2023-03-29 17:04:37 +00:00
Spandan Das
d81574b983 [automerger skipped] Conditional inclusion of blueprint modules am: 4adcf84808 -s ours am: e420480dc3 -s ours am: e175104768 -s ours
am skip reason: Merged-In I79de0d7da3224a5b2025c27a5137f39d00c7382e with SHA-1 ed4af01be6 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/blueprint/+/22099753

Change-Id: I2ae0805aab38f19c7deaf5f83a4c60e54f035528
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-28 14:30:35 +00:00
Spandan Das
e175104768 [automerger skipped] Conditional inclusion of blueprint modules am: 4adcf84808 -s ours am: e420480dc3 -s ours
am skip reason: Merged-In I79de0d7da3224a5b2025c27a5137f39d00c7382e with SHA-1 ed4af01be6 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/blueprint/+/22099753

Change-Id: Icf7f8ae6c526e5536e3d9ac672b0abe487e4ccb0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-28 13:59:25 +00:00
Spandan Das
e420480dc3 [automerger skipped] Conditional inclusion of blueprint modules am: 4adcf84808 -s ours
am skip reason: Merged-In I79de0d7da3224a5b2025c27a5137f39d00c7382e with SHA-1 ed4af01be6 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/blueprint/+/22099753

Change-Id: If9313f6b3efd26a63a10e05124d9963461c4d4ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-28 13:32:10 +00:00
Jeongik Cha
20b3824bae Add GetOutputsFromModuleNames in Context am: 4589dfd812 am: 5f0243476d am: 3098a7708d am: 85db9526c1
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2501987

Change-Id: If1aec4b1af1e015b26e3270b9fd4ea3d9dee4a79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-28 05:53:09 +00:00
Jeongik Cha
85db9526c1 Add GetOutputsFromModuleNames in Context am: 4589dfd812 am: 5f0243476d am: 3098a7708d
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2501987

Change-Id: I83c494949f7463ee81a55486bc508bad084af5ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-28 05:23:31 +00:00
Jeongik Cha
3098a7708d Add GetOutputsFromModuleNames in Context am: 4589dfd812 am: 5f0243476d
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2501987

Change-Id: Ifb76a04c9cd213d0de233f0dfa8a7a48997eed46
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-28 04:55:17 +00:00
Jeongik Cha
5f0243476d Add GetOutputsFromModuleNames in Context am: 4589dfd812
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2501987

Change-Id: I2496ffe00c2a0fa8c6515911c94de11835852bdd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-28 04:27:24 +00:00
Sam Delmerico
08bd504b62 ignore bp files from PRODUCT_SOURCE_ROOT_DIRS
Soong analyzes the entire source tree even though not every lunch target
needs to know about every module. For example, OEM sources can be
ignored for cuttlefish products. This functionality allows blueprint to
ignore a list of undesired directories.

Bug: 269457150
Change-Id: Icbbf8f3b66813ad639a7ebd27b1a3ec153cbf269
2023-03-27 14:43:07 -04:00
Jeongik Cha
4589dfd812 Add GetOutputsFromModuleNames in Context
To build ninja hint including output path from module name

Test: m --ninja_weight_source=soong
Bug: 273282046
Change-Id: Ibb94c2c4efef4a6dedc973cbb90625231845d42e
2023-03-23 11:17:11 +09:00
Cole Faust
e7bc4fe4e5 Optimize and simplify order-only dep deduplication am: bef8688e45 am: 86c4dd91a5 am: 60af4fd79c am: e151d1cc0e
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2492857

Change-Id: I85e39d13bf45259dd5b12efbe7d019960eaebd0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-17 19:41:13 +00:00
Cole Faust
e151d1cc0e Optimize and simplify order-only dep deduplication am: bef8688e45 am: 86c4dd91a5 am: 60af4fd79c
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2492857

Change-Id: I5d93a7dc15edc20aea1bf870d6016335cf7cedab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-17 19:03:57 +00:00
Cole Faust
60af4fd79c Optimize and simplify order-only dep deduplication am: bef8688e45 am: 86c4dd91a5
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2492857

Change-Id: I734ec31cb611c4551c3821ff3c70f1247a714846
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-17 18:27:42 +00:00
Cole Faust
86c4dd91a5 Optimize and simplify order-only dep deduplication am: bef8688e45
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2492857

Change-Id: I11d5b303611872b7d7243146a85a8fdfb6200c89
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-17 17:49:32 +00:00
Cole Faust
bef8688e45 Optimize and simplify order-only dep deduplication
This reduces the extract_phonys (now deduplicate_order_only_deps)
event's time from ~1.9s to ~1.5s on aosp-master, and from ~5.3s to ~4.6s
on internal master.

It does so by making keyForPhonyCandidate be based on a hash instead
of joining all the deps together. Having a hash allows us to also use
it as the name of the phony target, which simplifies the code a little.

Bug: None (original cl introducing extractPhonys also didn't have a bug)
Test: go tests
Change-Id: I2ff6e4614f19ccbfe99112ea7ae1ea33cd1df21b
2023-03-16 16:43:55 -07:00
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
180b7ea33f Merge "Fix error messages not printing names" am: 2ed895448b am: ef778a12ac am: a18bf4dacb am: 9c1d8543c8
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2477772

Change-Id: Ia1329e5becf7eeb687124ed8fe4133b78de96e44
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-09 02:13:57 +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
aa2c0fc00f Use phony ninja outputs to reduce file-size am: 2bae13b095 am: 80d4d41953 am: ff1beefbb9 am: 90b54a230c
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2449271

Change-Id: I6b682e7182ea400c537c06af3249f74eff026848
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 18:15:41 +00: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
e0f853c59a Enable parallelCompile since golang is now >= 1.9 am: ad7bcc7b50 am: 0ce4909fd2 am: bcdf8aceda am: 7613e68b09
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2469723

Change-Id: I0647ade671d61855e2999cea4ad523bdcae0bed5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-06 19:47:05 +00: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
b5998aaf98 cosmetic: readability am: 4cff07db25 am: 35136c7d74 am: f1f0a2b86d am: d56dd996a3
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2449269

Change-Id: Ia87fb1dea816fd76fc6c4d2fe7a0b6880b2a3597
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-02 06:56:16 +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
bc83913ee9 Add unit test for EventHandler am: 3e334cfed2 am: 66a29aefa0 am: db79b843ca am: ea06372da3
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2458548

Change-Id: I62fe1221e115534b6968c3a77dfc330864b53717
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-28 22:24:52 +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