Treehugger Robot
1002761b93
Merge "Add a filelock for in-place case" am: cdbab1ea51
am: 4bb43ed7a2
am: 87642d1daf
am: 1ef4defe98
...
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2092123
Change-Id: I3598616ee25cdc25cda81650c312a6f8eace79b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13 23:45:41 +00:00
Treehugger Robot
1ef4defe98
Merge "Add a filelock for in-place case" am: cdbab1ea51
am: 4bb43ed7a2
am: 87642d1daf
...
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2092123
Change-Id: Ia85d8f5b57c2ca8edcd3383b83fa08a7111af095
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13 21:19:37 +00:00
Treehugger Robot
87642d1daf
Merge "Add a filelock for in-place case" am: cdbab1ea51
am: 4bb43ed7a2
...
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2092123
Change-Id: Iafa406ca58dd9c129ff5823a4d09254ff971f82e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13 20:41:58 +00:00
Treehugger Robot
4bb43ed7a2
Merge "Add a filelock for in-place case" am: cdbab1ea51
...
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2092123
Change-Id: Ic1fecda84792216985d366c40e2b8afbecfdf58c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13 19:50:05 +00:00
Chris Parsons
91f638f692
Support pre-build-action hook in blueprint
...
This allows for a bazel-invocation hook in mixed builds, which allows
for mixed builds to take place in only a single pass, greatly improving
its performance and complexity.
Test: Conjunction with build/soong CL
Change-Id: If89fb56830b4eb06d3263d6ca6da7b285e7ba315
2022-05-10 13:46:40 -04:00
Treehugger Robot
cdbab1ea51
Merge "Add a filelock for in-place case"
2022-05-10 04:06:52 +00:00
Jeongik Cha
28c7996f2c
Add a filelock for in-place case
...
Multiple bpmodify process on the same Android.bp can run in parallel in
the case of aidl-freeze-api.
So, add a file lock for in-place editing case(-w)
Bug: 229413853
Test: run bpmodify in parallel and check result
Change-Id: I5368b0304b59f34fff60025120b38cc5f615ac40
2022-05-10 01:30:08 +00:00
Liz Kammer
1be00d5db5
Rename jsonVariationMap to jsonVariations. am: c6d80893cb
am: 72848a40d8
am: 49f47d14d9
am: 2826d6a550
...
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2075942
Change-Id: Ifcf9579336076e868aa4191da01c26f6656b1a37
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 16:37:17 +00:00
Liz Kammer
2826d6a550
Rename jsonVariationMap to jsonVariations. am: c6d80893cb
am: 72848a40d8
am: 49f47d14d9
...
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2075942
Change-Id: I3424cae971910d8bb4d27b424f84cbd11f27a560
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 16:13:38 +00:00
Liz Kammer
49f47d14d9
Rename jsonVariationMap to jsonVariations. am: c6d80893cb
am: 72848a40d8
...
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2075942
Change-Id: Ie8e5bec8f2e0e58bbdf4da3af6b71845d316af23
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 15:33:50 +00:00
Liz Kammer
72848a40d8
Rename jsonVariationMap to jsonVariations. am: c6d80893cb
...
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2075942
Change-Id: I0bdab16aac2d2c4b6000d9553f2e58634eba89c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 15:09:11 +00:00
Liz Kammer
0cd0d4fbbc
Add info to json module graph about CreateModule
...
Blueprint already stores the module that called CreateModule, let's
surface it.
Test: m json-module-graph and view results
Change-Id: Ie67bf8e431d764eb23727c90200f57c9de4ab053
2022-05-03 10:49:10 -04:00
Liz Kammer
c6d80893cb
Rename jsonVariationMap to jsonVariations.
...
Test: m json-module-graph
Change-Id: I99663586ded4c5d7c0f61859292afbcf80a1e526
2022-05-03 12:33:02 +00:00
Treehugger Robot
566267c0d6
Merge "Update CreateModule to require a type name" am: 5208ee885c
am: 6d5c00183d
am: fdf38ed489
am: adedb1025c
...
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2075941
Change-Id: I312c930338bc1317e7e549ad1460bad1d73aed24
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 18:20:38 +00:00
Treehugger Robot
adedb1025c
Merge "Update CreateModule to require a type name" am: 5208ee885c
am: 6d5c00183d
am: fdf38ed489
...
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2075941
Change-Id: Ieb04d341fa7d2127053212babe905a21ff7e358a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 17:56:12 +00:00
Treehugger Robot
fdf38ed489
Merge "Update CreateModule to require a type name" am: 5208ee885c
am: 6d5c00183d
...
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2075941
Change-Id: If31dc33089fcf58c3a5f59aa3bd8b1658bb54862
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 17:53:12 +00:00
Treehugger Robot
6d5c00183d
Merge "Update CreateModule to require a type name" am: 5208ee885c
...
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2075941
Change-Id: I4cf841f573e5315fdf468ca9ac79ad5f433419c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 17:27:49 +00:00
Treehugger Robot
5208ee885c
Merge "Update CreateModule to require a type name"
2022-04-27 16:00:35 +00:00
Liz Kammer
9967d62fad
Update CreateModule to require a type name
...
This makes the LoadHook and TopDownMutatorContext interfaces for
CreateModule the same.
Test: CI
Change-Id: I30122099bdf109cda40f9d81a574dd6fa861f459
2022-04-26 09:15:13 -04:00
Lukacs T. Berki
fc8c3e1f3d
Remove the concept of "early mutator". am: 83a5a308b1
am: 85011ed22a
am: 24a8eb0e51
am: c25454a0d5
am: cfcb14e688
...
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2067144
Change-Id: Icd1fa001a0e44e7a5cb1931f07a74a9710fa8bc5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 11:52:20 +00:00
Lukacs T. Berki
cfcb14e688
Remove the concept of "early mutator". am: 83a5a308b1
am: 85011ed22a
am: 24a8eb0e51
am: c25454a0d5
...
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2067144
Change-Id: I77902e521cb7f9d501c6db9bec5cac6b7a31b588
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 09:11:43 +00:00
Lukacs T. Berki
c25454a0d5
Remove the concept of "early mutator". am: 83a5a308b1
am: 85011ed22a
am: 24a8eb0e51
...
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2067144
Change-Id: I06e5296e3748fb6e1cc84d267b22d12e96b45a50
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 08:01:56 +00:00
Lukacs T. Berki
24a8eb0e51
Remove the concept of "early mutator". am: 83a5a308b1
am: 85011ed22a
...
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2067144
Change-Id: I3f1ee5e004ba71d5ded49f471b7ed1e883e5d36b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 07:44:04 +00:00
Lukacs T. Berki
85011ed22a
Remove the concept of "early mutator". am: 83a5a308b1
...
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2067144
Change-Id: Idef83a405d9f5be0fdeb198a72440aa15c0c42b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 07:16:49 +00:00
Lukacs T. Berki
83a5a308b1
Remove the concept of "early mutator".
...
It was unused and as such, maintenance cost for no benefit.
Test: Presubmits.
Change-Id: Ifc35c0f55647ef88ed0bfa44bcf709e51a904ea4
2022-04-19 18:12:03 +02:00
Liz Kammer
3e80e0d5b0
Change jsonVariationMap to array of struct am: 8097d1a0e6
am: 465668494e
am: b753906270
am: 353186f043
am: bb15015143
...
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2059708
Change-Id: I5d0bdec9cde422dc73bc660c8a17349ff09d5ff3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-11 14:14:55 +00:00
Liz Kammer
bb15015143
Change jsonVariationMap to array of struct am: 8097d1a0e6
am: 465668494e
am: b753906270
am: 353186f043
...
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2059708
Change-Id: Id1f08f199555d2e09fbd1daa6ce37c7369e1200e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-11 14:00:46 +00:00
Liz Kammer
353186f043
Change jsonVariationMap to array of struct am: 8097d1a0e6
am: 465668494e
am: b753906270
...
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2059708
Change-Id: I8f7c098edb84a512d520618375c5832e9ac7d040
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-11 13:39:00 +00:00
Liz Kammer
b753906270
Change jsonVariationMap to array of struct am: 8097d1a0e6
am: 465668494e
...
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2059708
Change-Id: Ia3c6ac6f7567822d1d8079955f2f613aaba46303
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-11 13:18:08 +00:00
Liz Kammer
465668494e
Change jsonVariationMap to array of struct am: 8097d1a0e6
...
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2059708
Change-Id: Ie33f624c729e4dccc338361ac2da1334a74bb2c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-11 12:48:53 +00:00
Liz Kammer
8097d1a0e6
Change jsonVariationMap to array of struct
...
This more structured data is easier to query
Test: m json-module-graph & look at the graph
Change-Id: I44ba6a8df12208705f37ee6908ad5391a6f404a1
2022-04-08 13:14:13 -04:00
Treehugger Robot
fe6535ef4f
Merge "Add event handling to blueprint for metrics" am: 0d2386c60a
am: 588582db8a
am: ccd4224c8a
...
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2043864
Change-Id: I58a0183d93378e4ed3b6b2f518013386ba8c9f96
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-26 01:06:44 +00:00
Treehugger Robot
ccd4224c8a
Merge "Add event handling to blueprint for metrics" am: 0d2386c60a
am: 588582db8a
...
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2043864
Change-Id: I8cc05142308c57fe3fd508fca8bb96f342eb8a32
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-26 00:54:03 +00:00
Treehugger Robot
588582db8a
Merge "Add event handling to blueprint for metrics" am: 0d2386c60a
...
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2043864
Change-Id: Iac29ec571d3633869047716a6607e0c8212b5f91
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-26 00:37:56 +00:00
Treehugger Robot
0d2386c60a
Merge "Add event handling to blueprint for metrics"
2022-03-26 00:21:21 +00:00
Chris Parsons
18ebb2318a
Add event handling to blueprint for metrics
...
In conjunction with soong/build changes, this materialized runtime
metrics for various soong_build events.
Test: Manually verified materialized protos for bp2build, mixed builds,
and legacy build.
Change-Id: Ia92403605e3063028dbf6a1ded8449c190b9e63e
2022-03-25 13:15:17 -04:00
Treehugger Robot
f8ca3c834d
Merge "force LoadHookContext to specify module type" am: 310b0cec5d
am: e1c02fcc8f
am: 92d62e820c
...
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2018479
Change-Id: Ibd64be368677da201162b457a2958149e008f7c2
2022-03-11 00:48:28 +00:00
Treehugger Robot
92d62e820c
Merge "force LoadHookContext to specify module type" am: 310b0cec5d
am: e1c02fcc8f
...
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2018479
Change-Id: I5530afd6555cf0dc44e91517957d64f5363f5d27
2022-03-11 00:27:08 +00:00
Treehugger Robot
e1c02fcc8f
Merge "force LoadHookContext to specify module type" am: 310b0cec5d
...
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2018479
Change-Id: I91aee3cdf30c47302a2dbe0b0023c6c2dc97f248
2022-03-11 00:03:22 +00:00
Treehugger Robot
310b0cec5d
Merge "force LoadHookContext to specify module type"
2022-03-10 23:37:08 +00:00
Sam Delmerico
518966d09e
force LoadHookContext to specify module type
...
Modules created by a LoadHookContext do not currently set a module type
when creating new modules, but it would make analysis of the
module-graph.json much easier if this module type information was available.
Bug: 174879786
Test: m json-module-graph && check that module which previously had a
blank module type now have the field populated
Change-Id: Ie2fa4244113b6254e6678da9a663d883e2a48a41
2022-03-09 20:50:48 +00:00
jiajia tang
6c2694e733
Fix duplicate typo am: eb27645af9
am: 7fb64499c8
am: 1ee93e7dc8
...
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2015036
Change-Id: Ib12b8d6455b0eea27c44e495328db07cdb61a0e9
2022-03-08 22:38:46 +00:00
jiajia tang
1ee93e7dc8
Fix duplicate typo am: eb27645af9
am: 7fb64499c8
...
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2015036
Change-Id: I898fbac4b55919b6a3804064e8fadf87191b4ebd
2022-03-08 22:15:09 +00:00
jiajia tang
7fb64499c8
Fix duplicate typo am: eb27645af9
...
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2015036
Change-Id: I9f471d0db71f250b2d4791e62ae40d5e1802a25d
2022-03-08 21:48:01 +00:00
jiajia tang
eb27645af9
Fix duplicate typo
...
Comments typo fix
Signed-off-by: jiajia tang <tangjiajia@xiaomi.com>
Change-Id: I89bf5aa5a3a57cda4b1e74195894341f9089e11c
2022-03-08 19:50:09 +08:00
Jeongik Cha
74f1e4ec8c
bpmodify: remove-property am: 5860caea33
am: 7f6948364f
am: ce15d515d3
...
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1977929
Change-Id: I774f3a23a83d093168fc9fb960d92c0980229f70
2022-02-14 04:42:02 +00:00
Jeongik Cha
ce15d515d3
bpmodify: remove-property am: 5860caea33
am: 7f6948364f
...
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1977929
Change-Id: I758373a11d68afcb8fe4fa7cd6465ebe8b0ccaa6
2022-02-14 04:24:26 +00:00
Jeongik Cha
7f6948364f
bpmodify: remove-property am: 5860caea33
...
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1977929
Change-Id: Id817d44f9aa68665e310eb7dc61985e1065bb9e6
2022-02-14 04:06:49 +00:00
Xin Li
6479de67d9
[automerger skipped] Empty merge of sc-v2-dev-plus-aosp-without-vendor@8084891 am: 17c110c581
-s ours am: 34c0e50293
-s ours
...
am skip reason: Merged-In Ie32bc2a0d075b1b7cc9fe1247d1f02dc1af67449 with SHA-1 5319d07308
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/blueprint/+/16843586
Change-Id: I618a2234d50fe74522387ddd3614a41f2112d1b2
2022-02-11 20:56:38 +00:00
Xin Li
34c0e50293
[automerger skipped] Empty merge of sc-v2-dev-plus-aosp-without-vendor@8084891 am: 17c110c581
-s ours
...
am skip reason: Merged-In Ie32bc2a0d075b1b7cc9fe1247d1f02dc1af67449 with SHA-1 5319d07308
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/blueprint/+/16843586
Change-Id: I47b927111aeb64ad2ea447d8f91cd46d3262c2bf
2022-02-11 20:34:10 +00:00