Commit graph

2917 commits

Author SHA1 Message Date
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
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
Treehugger Robot
3ffe4e3641 Merge "ignore bp files from PRODUCT_SOURCE_ROOT_DIRS" am: 82aa0ffb51 am: 2451597ebe am: b4a2d1622d am: 904ee8bc8a am: 93ed21992d
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2448683

Change-Id: I2fe0965f67fdb2590a1ce7c690c9be7dd6cd8c73
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-30 23:31:29 +00:00
Treehugger Robot
9926b68a06 Merge "ignore bp files from PRODUCT_SOURCE_ROOT_DIRS" am: 82aa0ffb51 am: 2451597ebe am: b4a2d1622d am: 904ee8bc8a am: 0d4862f446
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2448683

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

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

Change-Id: Ib37567b6de758fa4b41db098a58a093a70a69fc8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-30 22:05:37 +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
Automerger Merge Worker
abe473e480 Merge "[automerger skipped] Conditional inclusion of blueprint modules am: 4adcf84808 -s ours am: e420480dc3 -s ours am: e175104768 -s ours am: a207483e42 -s ours" 2023-03-28 14:57:02 +00:00
Spandan Das
2b0f9aa918 [automerger skipped] Conditional inclusion of blueprint modules am: 4adcf84808 -s ours am: e420480dc3 -s ours am: e175104768 -s ours am: a207483e42 -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: I70317314133318e972b1060d041509e1670ee17b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-28 14:56:46 +00:00
Spandan Das
3a010f12cd [automerger skipped] Conditional inclusion of blueprint modules am: 4adcf84808 -s ours am: e420480dc3 -s ours am: e175104768 -s ours am: d81574b983 -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: I0e55f1339c57acaa57b58feb1ebb02f496e8f60a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-28 14:56:28 +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