tequilaOS/platform_build_blueprint
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
2714 commits 1 branch 0 tags 7.4 MiB
Commit graph

2714 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
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
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
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
Sam Delmerico
d5d574c65f improve error handling for SourceRootDirs am: 48020c8daa 
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2515504

Change-Id: Id223371dd875a27efc1a721b9420510acf0490b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-31 15:23:25 +00:00
Sam Delmerico
48020c8daa improve error handling for SourceRootDirs 
Previously, warnings about missing modules were printed directly to
stderr. Instead we can pass these messages along as errors using the
existing pathways.

Bug: 269457150
Test: m nothing
Test: add -external to PRODUCT_SOURCE_ROOT_DIRS and observe missing
  module errors
Change-Id: Ib6624b9edbd103247f7f6e6d4c3030f1959aa56c
 2023-03-30 14:19:39 -04:00
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
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
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
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
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