Commit graph

2981 commits

Author SHA1 Message Date
William Escande
82cb863d8e bpfmt: Test comment line while sorting arrays am: a74d05b939 am: 26801b1c03 am: 438d864e2f am: d46299e855
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2593367

Change-Id: Ib5b6667cd8e2570c3007c8cdc1519a81159bd890
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 06:15:06 +00:00
David Duarte
1b08025c76 bpfmt: Preserve line of comment when sorting arrays am: 65aa5a505f am: 9ef2774045 am: 81818b05db am: a54e139252
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2542770

Change-Id: I09b7fd6a5540204fedcfe93f1d030f47ae0adffe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 06:15:04 +00:00
William Escande
d46299e855 bpfmt: Test comment line while sorting arrays am: a74d05b939 am: 26801b1c03 am: 438d864e2f
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2593367

Change-Id: I191adfc05652ddd75b832296c32a663eb6d92fad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 05:31:59 +00:00
David Duarte
a54e139252 bpfmt: Preserve line of comment when sorting arrays am: 65aa5a505f am: 9ef2774045 am: 81818b05db
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2542770

Change-Id: I3936f90ae7e5f64e07c24c57f8d63a18fca21432
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 05:31:57 +00:00
William Escande
438d864e2f bpfmt: Test comment line while sorting arrays am: a74d05b939 am: 26801b1c03
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2593367

Change-Id: I9f85b2d7c1788f466f31189fb000066f8442bf53
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 04:25:59 +00:00
David Duarte
81818b05db bpfmt: Preserve line of comment when sorting arrays am: 65aa5a505f am: 9ef2774045
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2542770

Change-Id: Ife79eb744ef2a18324636ad94c613e640038e6d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 04:25:57 +00:00
William Escande
26801b1c03 bpfmt: Test comment line while sorting arrays am: a74d05b939
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2593367

Change-Id: Ic45a7c6b2d443d51520b63553ed6a5461860044b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 03:42:47 +00:00
David Duarte
9ef2774045 bpfmt: Preserve line of comment when sorting arrays am: 65aa5a505f
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2542770

Change-Id: Ied01a8f28324d01c6bbcd77170a3c6f48949979e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 03:42:46 +00:00
William Escande
a74d05b939 bpfmt: Test comment line while sorting arrays
Test: bpfmt test
Change-Id: I4a11ac200a7b10d3abb76db78f4be2ef772763cf
2023-05-17 15:17:49 -07:00
David Duarte
65aa5a505f bpfmt: Preserve line of comment when sorting arrays
When given as an input
```
array: [
    "a",
    // Unicorn
    "b",
]
```
bpfmt with `-s` option was outputing
```
array: [
    "a", // Unicorn
    "b",
]
```

Which is not ideal because the comment was targetting
the second value and now it seems to be targetting the
first one

This patch preserve the difference in line number between
the value and the comment to give the same output when
```
array: [
    "a",
    // Unicorn
    "b",
]
```
is given as input

Test: Manual tests + run bpfmt -w -s on packages/modules/Bluetooth
Change-Id: I2b58f20da463bea77c22a4e6978aa9beb4b4fcc8
2023-05-17 13:36:13 -07:00
Jeongik Cha
fe75917416 Replace GetOutputsFromModuleNames with GetWeightedOutputsFromPredicate am: 2621c909e5 am: 1828108878 am: 513b7b0ca9 am: 495550b9a4 am: 15d2ed8603 am: 04da6d4709
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2527126

Change-Id: I5143e70af08e35523d9aca9088397967b976bb40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 09:52:19 +00:00
Jeongik Cha
04da6d4709 Replace GetOutputsFromModuleNames with GetWeightedOutputsFromPredicate am: 2621c909e5 am: 1828108878 am: 513b7b0ca9 am: 495550b9a4 am: 15d2ed8603
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2527126

Change-Id: I9069e8362f17c06ab7b1c5318244776c8ee3c39a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 09:03:35 +00:00
Jeongik Cha
15d2ed8603 Replace GetOutputsFromModuleNames with GetWeightedOutputsFromPredicate am: 2621c909e5 am: 1828108878 am: 513b7b0ca9 am: 495550b9a4
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2527126

Change-Id: I20c3162903b705e46a30222e57364de71439499e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 08:23:11 +00:00
Jeongik Cha
495550b9a4 Replace GetOutputsFromModuleNames with GetWeightedOutputsFromPredicate am: 2621c909e5 am: 1828108878 am: 513b7b0ca9
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2527126

Change-Id: I849a658ed09c3125d4d53c53a72d80fd9271c7c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 07:41:23 +00:00
Jeongik Cha
513b7b0ca9 Replace GetOutputsFromModuleNames with GetWeightedOutputsFromPredicate am: 2621c909e5 am: 1828108878
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2527126

Change-Id: I620d2feaee22960f0a9df50aa1aa81d108b64154
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 06:53:54 +00:00
Jeongik Cha
1828108878 Replace GetOutputsFromModuleNames with GetWeightedOutputsFromPredicate am: 2621c909e5
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2527126

Change-Id: I9102f23cea1b52c66b0b2964d591c7a8eaf7e8c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 06:13:59 +00:00
Jeongik Cha
2621c909e5 Replace GetOutputsFromModuleNames with GetWeightedOutputsFromPredicate
Bug: 273282046
Test: m --ninja_weight_source=ninja_log
Change-Id: I3f35406a7334f737ea010d5453c85e5f2d993708
2023-04-15 00:57:28 +09:00
Steven Moreland
d998c31ea5 Merge "Add name hint to blueprint." am: aefc0a9b9b am: b72e38080e am: bedb263bc4 am: 85934ee063 am: b69e2c12fa
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2518036

Change-Id: Ia9b2ec810b3a405a88c711ec0d51f26da04806ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12 04:46:35 +00:00
Steven Moreland
07a75e1780 Merge "Add name hint to blueprint." am: aefc0a9b9b am: b72e38080e am: bedb263bc4 am: 85934ee063 am: bbbced136f
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2518036

Change-Id: Ie426ce34497b1c86f46d2ab6894d4f41221c4c67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12 04:45:43 +00:00
Steven Moreland
b69e2c12fa Merge "Add name hint to blueprint." am: aefc0a9b9b am: b72e38080e am: bedb263bc4 am: 85934ee063
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2518036

Change-Id: I2b87ffe635740d642071950fc5a95e2460ad716e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12 04:04:30 +00:00
Steven Moreland
bbbced136f Merge "Add name hint to blueprint." am: aefc0a9b9b am: b72e38080e am: bedb263bc4 am: 85934ee063
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2518036

Change-Id: I87de89b5c8ec6a47c3a2c20f516a314e7f470255
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12 04:03:03 +00:00
Steven Moreland
85934ee063 Merge "Add name hint to blueprint." am: aefc0a9b9b am: b72e38080e am: bedb263bc4
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2518036

Change-Id: Idb96d125caa7dc5bef7e9febb63e2050a11210c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12 03:18:16 +00:00
Steven Moreland
bedb263bc4 Merge "Add name hint to blueprint." am: aefc0a9b9b am: b72e38080e
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2518036

Change-Id: If5b3eb3f21248362f9e819f1ab71d72446319eb7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12 02:47:27 +00:00
Steven Moreland
b72e38080e Merge "Add name hint to blueprint." am: aefc0a9b9b
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2518036

Change-Id: I2c633c44ed61150808c578c5c1338d6e68d7f185
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-12 02:16:35 +00:00
Steven Moreland
aefc0a9b9b Merge "Add name hint to blueprint." 2023-04-11 20:26:04 +00:00
Steven Moreland
d457f11884 Add name hint to blueprint.
Bug: N/A
Test: updated
Change-Id: Iac9218aa7621dd6223dc26a9f2ebec5d68211328
2023-04-10 20:21:15 +00:00
Treehugger Robot
8691d3f817 Merge "Add variant name to module info" am: a85a30c611 am: 0dbf7c740f am: b1b9cbc149 am: 10b9f13f96 am: f988bdde8d
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2526240

Change-Id: I3a6826700498837070942dc06f893e7cadd06ce3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-07 20:06:51 +00:00
Treehugger Robot
d85212e31d Merge "Add variant name to module info" am: a85a30c611 am: 0dbf7c740f am: b1b9cbc149 am: 10b9f13f96 am: 3812773ddc
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2526240

Change-Id: I3fcbf5affcdb7bb636fce69869fe9ba39b399994
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-07 20:06:30 +00:00
Treehugger Robot
3812773ddc Merge "Add variant name to module info" am: a85a30c611 am: 0dbf7c740f am: b1b9cbc149 am: 10b9f13f96
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2526240

Change-Id: I81227f492f78e50c484d223cf6980f65faf60548
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-07 19:36:29 +00:00
Treehugger Robot
f988bdde8d Merge "Add variant name to module info" am: a85a30c611 am: 0dbf7c740f am: b1b9cbc149 am: 10b9f13f96
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2526240

Change-Id: I212d62e8fec0bf7bfd01cc8afc2f0ed2933a9747
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-07 19:36:19 +00:00
Treehugger Robot
10b9f13f96 Merge "Add variant name to module info" am: a85a30c611 am: 0dbf7c740f am: b1b9cbc149
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2526240

Change-Id: I20af3a6880b8bc148d4ecbd6e961390b0da98085
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-07 19:06:22 +00:00
Treehugger Robot
b1b9cbc149 Merge "Add variant name to module info" am: a85a30c611 am: 0dbf7c740f
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2526240

Change-Id: Ibb65584467db027fb7de99793781ef87861b0f8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-07 18:22:37 +00:00
Treehugger Robot
0dbf7c740f Merge "Add variant name to module info" am: a85a30c611
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2526240

Change-Id: I124f70af1008b187917048066e69004327035ead
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-07 17:52:32 +00:00
Treehugger Robot
a85a30c611 Merge "Add variant name to module info" 2023-04-07 17:15:06 +00:00
Liz Kammer
6717f89de4 Add variant name to module info
Without this, we cannot correctly join action and module graph
information as we cannot distinguish variants on action graph.

Test: m json-module-graph
Change-Id: If7379845fc865d8a150f3995df6bf601456a71c3
2023-04-07 09:11:30 -04:00
Treehugger Robot
ceebaabef9 Merge "Add a stronger wording to don't use ModuleFromName" am: 44baecd513 am: bb0a61e40c am: a6b048dcbb am: bd42ee2158 am: 85d476444c
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2522235

Change-Id: I682fd577e87769af495c8a5d43a4f97f3e3e8100
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-05 06:29:47 +00:00
Treehugger Robot
56469fa70f Merge "Add a stronger wording to don't use ModuleFromName" am: 44baecd513 am: bb0a61e40c am: a6b048dcbb am: bd42ee2158 am: c99fbec709
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2522235

Change-Id: I4aeef52602cde7f92dafcceee3496bcddb04347c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-05 06:29:35 +00:00
Treehugger Robot
85d476444c Merge "Add a stronger wording to don't use ModuleFromName" am: 44baecd513 am: bb0a61e40c am: a6b048dcbb am: bd42ee2158
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2522235

Change-Id: I60408a27a7161bfbe18d41c96b88c4a53dda4671
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-05 06:02:40 +00:00
Treehugger Robot
c99fbec709 Merge "Add a stronger wording to don't use ModuleFromName" am: 44baecd513 am: bb0a61e40c am: a6b048dcbb am: bd42ee2158
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2522235

Change-Id: I19bd6522ea4618e3a6b8afb4834c5ec7335276c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-05 06:02:38 +00:00
Treehugger Robot
bd42ee2158 Merge "Add a stronger wording to don't use ModuleFromName" am: 44baecd513 am: bb0a61e40c am: a6b048dcbb
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2522235

Change-Id: I043a0c4b4d673fbf66f63efb9ce6f267259f2f4f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-05 05:31:51 +00:00
Treehugger Robot
a6b048dcbb Merge "Add a stronger wording to don't use ModuleFromName" am: 44baecd513 am: bb0a61e40c
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2522235

Change-Id: I07e970c600953764f3472a78febd2433eaf832fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-05 05:01:03 +00:00
Treehugger Robot
bb0a61e40c Merge "Add a stronger wording to don't use ModuleFromName" am: 44baecd513
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2522235

Change-Id: I1ae19873ad528b9a7779a264cc375c53624f8535
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-05 04:33:11 +00:00
Treehugger Robot
44baecd513 Merge "Add a stronger wording to don't use ModuleFromName" 2023-04-05 04:03:15 +00:00
Liz Kammer
c9df6d7964 Add a stronger wording to don't use ModuleFromName
Test: n/a
Change-Id: I42de1e46a50a103fca0d6f60a0748f5cc107bac7
2023-04-04 11:56:55 -04:00
Sam Delmerico
790aceb50a improve error handling for SourceRootDirs am: 48020c8daa am: d5d574c65f am: d8de876ee5 am: 957dfc44cd am: b8c5aa8d85
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2515504

Change-Id: I985083d19dee6a918a13836dd8434493b1d79f29
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-31 19:45:16 +00:00
Sam Delmerico
ff1e54693a improve error handling for SourceRootDirs am: 48020c8daa am: d5d574c65f am: d8de876ee5 am: 957dfc44cd am: 06af53db4c
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2515504

Change-Id: I03db1203b023225bd1b1d06006b1661d4388d9ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-31 19:15:32 +00:00
Sam Delmerico
b8c5aa8d85 improve error handling for SourceRootDirs am: 48020c8daa am: d5d574c65f am: d8de876ee5 am: 957dfc44cd
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2515504

Change-Id: If0b567c68228fbcea958d74bd7f0c9df4dba623a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-31 18:57:10 +00:00
Sam Delmerico
06af53db4c improve error handling for SourceRootDirs am: 48020c8daa am: d5d574c65f am: d8de876ee5 am: 957dfc44cd
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2515504

Change-Id: I1400f975782b6f391e3ac5d6a26c4cafc24c5693
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-31 18:41:17 +00:00
Sam Delmerico
957dfc44cd improve error handling for SourceRootDirs am: 48020c8daa am: d5d574c65f am: d8de876ee5
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2515504

Change-Id: I9b32044e7f840e4b8e0f1c31ca79089b4e1afa78
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-31 17:06:36 +00:00
Sam Delmerico
d8de876ee5 improve error handling for SourceRootDirs am: 48020c8daa am: d5d574c65f
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2515504

Change-Id: I57db921a3fb80581133ba01099d38ed30161a7c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-31 15:52:49 +00:00