Commit graph

2324 commits

Author SHA1 Message Date
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
Xin Li
17c110c581 Empty merge of sc-v2-dev-plus-aosp-without-vendor@8084891
Bug: 214455710
Merged-In: Ie32bc2a0d075b1b7cc9fe1247d1f02dc1af67449
Change-Id: I067e17c8207a4d9072bc259496759f954ffd693d
2022-02-11 06:10:32 +00:00
Jeongik Cha
5860caea33 bpmodify: remove-property
`r` option removes only item(s) in a list, so add `remove-property`
option to remove a property itself.

Bug: 146436251
Test: unittest
Change-Id: I0c838d31e72358f094cfb5fa9468dce07018e061
2022-02-11 05:54:33 +00:00
Jooyung Han
d5e860d573 bpmodify: -add-literal to add a value to the list am: 451dd63611 am: 34f9c28f0f am: 94474d68bb am: 724340527a
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1977927

Change-Id: I1cf04a222fd6240144f604f3d87c1f365375ce37
2022-02-11 00:59:37 +00:00
Jooyung Han
40af33f090 Add newlines around list of structs am: 0cb1064428 am: d5be0c1c66 am: 2f36907173 am: a485b36980
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1977926

Change-Id: I48057a5c870a75f03766aae408e6cfc7ecad56d7
2022-02-11 00:59:36 +00:00
Jooyung Han
724340527a bpmodify: -add-literal to add a value to the list am: 451dd63611 am: 34f9c28f0f am: 94474d68bb
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1977927

Change-Id: I0bb4dbab747a6d4fc41d3e53f2822a0d3c3b9315
2022-02-11 00:45:54 +00:00
Jooyung Han
a485b36980 Add newlines around list of structs am: 0cb1064428 am: d5be0c1c66 am: 2f36907173
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1977926

Change-Id: Iceac1665f992325d36e5ea26b40c58f5aec33019
2022-02-11 00:45:53 +00:00
Jooyung Han
94474d68bb bpmodify: -add-literal to add a value to the list am: 451dd63611 am: 34f9c28f0f
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1977927

Change-Id: Ief368d04be77b6828338fcbb68d1bfc75bd1659d
2022-02-11 00:30:19 +00:00
Jooyung Han
2f36907173 Add newlines around list of structs am: 0cb1064428 am: d5be0c1c66
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1977926

Change-Id: Ie4446d7d00956070d9c1b3493a1362c48a5f3709
2022-02-11 00:30:18 +00:00
Jooyung Han
34f9c28f0f bpmodify: -add-literal to add a value to the list am: 451dd63611
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1977927

Change-Id: Idcb5633d38c7367e1b8a3bc4cfddebda43f0520a
2022-02-11 00:13:09 +00:00
Jooyung Han
d5be0c1c66 Add newlines around list of structs am: 0cb1064428
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1977926

Change-Id: I293133c1e09aa79807b3554c9a334e900830a985
2022-02-11 00:13:08 +00:00
Jooyung Han
451dd63611 bpmodify: -add-literal to add a value to the list
-a works with only string values. When we need to add numbers, booleans,
or even structs, -add-literal can be used now.

  bpmodify -m foo -property list-of-ints -add-literal 123
  bpmodify -m foo -property list-of-structs \
    -add-literal "{key: \"value\"}"

Bug: 146436251
Test: go test ./bpmodify
Change-Id: I91d23d7bf89491643aa595f5ebccd9410a9cbb09
2022-02-09 11:16:02 +09:00
Jooyung Han
0cb1064428 Add newlines around list of structs
Since a struct(parser.Map) occupies multiple lines, adding newlines
around brackets([]) looks better even the list has only a single value.

  prop: [ {
    name: "foo",
  }],

vs

  prop: [
    {
      name: "foo",
    },
  ],

Bug: n/a
Test: go test ./parser
Change-Id: I1a574aa038a26235848b6c9b5b4f01a0ab2c8c00
2022-02-09 11:10:12 +09:00
Liz Kammer
2587e3605f Add a limit to blueprint filesystem accesses am: 2df87f3cd9 am: f3a1b1a85a am: cb62acd070 am: 4e2bd9af84
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1975786

Change-Id: Ie46c1c9376efd14b7c3899577088a9af498f2776
2022-02-08 23:40:31 +00:00
Liz Kammer
4e2bd9af84 Add a limit to blueprint filesystem accesses am: 2df87f3cd9 am: f3a1b1a85a am: cb62acd070
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1975786

Change-Id: I33b85af0ea9592146658c33267d2c04d3a60b7a6
2022-02-08 23:23:19 +00:00
Liz Kammer
cb62acd070 Add a limit to blueprint filesystem accesses am: 2df87f3cd9 am: f3a1b1a85a
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1975786

Change-Id: Iec28e9ac4924bd0b021e7dff513a977dc41d188b
2022-02-08 23:06:43 +00:00
Liz Kammer
f3a1b1a85a Add a limit to blueprint filesystem accesses am: 2df87f3cd9
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1975786

Change-Id: Iac0f5009454c8f19f8a94bac501d041793ab8d46
2022-02-08 22:47:59 +00:00
Liz Kammer
2df87f3cd9 Add a limit to blueprint filesystem accesses
Mac builds keep running into too many files open. Restrict access of
filesystem to the current limit.

Test: m nothing
Change-Id: I2365da7c641f7c7f5d948396c6862eb3a0d1d8b9
2022-02-08 15:16:59 -05:00
Treehugger Robot
10bfba3f5a Merge "Rename saneSplit --> quickSplit" am: fc56ef6e20 am: bbd604b48a am: 3b3738c58a am: eeeac5ffc1
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1974127

Change-Id: I040658cb6dab453922d4ac75f95b49c2ae354464
2022-02-07 22:32:00 +00:00
Treehugger Robot
eeeac5ffc1 Merge "Rename saneSplit --> quickSplit" am: fc56ef6e20 am: bbd604b48a am: 3b3738c58a
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1974127

Change-Id: I8582aa8058556421cf5689738e2f2f3e41203018
2022-02-07 22:19:56 +00:00
Treehugger Robot
3b3738c58a Merge "Rename saneSplit --> quickSplit" am: fc56ef6e20 am: bbd604b48a
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1974127

Change-Id: Id0132f75fd965cf006863439f5dbfa92b2ff922a
2022-02-07 22:08:32 +00:00
Treehugger Robot
bbd604b48a Merge "Rename saneSplit --> quickSplit" am: fc56ef6e20
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1974127

Change-Id: I87bacf9d3a7b92ada403a166d3b7e0c914555f92
2022-02-07 21:49:43 +00:00
Treehugger Robot
fc56ef6e20 Merge "Rename saneSplit --> quickSplit" 2022-02-07 21:25:07 +00:00
Liz Kammer
9c21790378 Close file after reading am: 6e7e6a92c7 am: 1766f42947 am: 049aff5037 am: e2fa5d1288
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1972903

Change-Id: I37ca16cf0f9f6d228e61442876c0b5f5a9c49a78
2022-02-07 19:37:55 +00:00
Liz Kammer
e2fa5d1288 Close file after reading am: 6e7e6a92c7 am: 1766f42947 am: 049aff5037
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1972903

Change-Id: I51d846671782cf16c0bf6a08cb9b8defd600a250
2022-02-07 19:23:33 +00:00
Liz Kammer
049aff5037 Close file after reading am: 6e7e6a92c7 am: 1766f42947
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1972903

Change-Id: I13d7dfd6a95fd969e275cf0fed89742e28efb608
2022-02-07 19:14:25 +00:00
Liz Kammer
1766f42947 Close file after reading am: 6e7e6a92c7
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1972903

Change-Id: I4b7b5e4d4fa5c36ced93d328b254856a3a6896f9
2022-02-07 19:02:40 +00:00
Liz Kammer
6e7e6a92c7 Close file after reading
Test: m nothing
Change-Id: Ib2daa2081d47c52bd3994520d522c5df95973e4a
2022-02-07 10:04:51 -05:00