Commit graph

2557 commits

Author SHA1 Message Date
Spandan Das
b76ef1d3a2 Merge "Conditional inclusion of blueprint modules" am: c3887c2bbb am: 9bc3a984d7 am: e2abe5bfa6
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2296765

Change-Id: Ifc91f9fcc16edc676bccaaa914b5700392ab6e2c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-06 01:29:44 +00:00
Spandan Das
e2abe5bfa6 Merge "Conditional inclusion of blueprint modules" am: c3887c2bbb am: 9bc3a984d7
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2296765

Change-Id: If04d9ceaddcbd5c8dc8a28b69241e7c6c9cbb517
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-06 00:50:20 +00:00
Spandan Das
9bc3a984d7 Merge "Conditional inclusion of blueprint modules" am: c3887c2bbb
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2296765

Change-Id: I013db529bab6f374bc1ba5831947464336a571a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-06 00:18:11 +00:00
Spandan Das
c3887c2bbb Merge "Conditional inclusion of blueprint modules" 2022-12-05 23:50:23 +00:00
MarkDacek
ba4225a07f Add bazel-force-enabled-modules. am: 99f7962b35 am: 2def2db38b am: f1423d13cb
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2322194

Change-Id: I0f37025b73235025f0410a9cf8d6609b65524f4f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-02 23:44:55 +00:00
MarkDacek
f1423d13cb Add bazel-force-enabled-modules. am: 99f7962b35 am: 2def2db38b
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2322194

Change-Id: I0429639c8191020ccb594e597ddae9c740845514
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-02 23:00:02 +00:00
MarkDacek
2def2db38b Add bazel-force-enabled-modules. am: 99f7962b35
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2322194

Change-Id: If3e2893d549129999b077de97816a81aa13c6055
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-02 22:29:42 +00:00
Spandan Das
ed4af01be6 Conditional inclusion of blueprint modules
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
2022-12-02 01:46:28 +00:00
MarkDacek
99f7962b35 Add bazel-force-enabled-modules.
Test: m nothing
Change-Id: I97d8fcb304f0d039fd7bbd3ea3d01966ae25471f
2022-12-01 20:15:33 +00:00
Colin Cross
a02a789e41 Add VariableFuncContext argument to VariableFuncs am: 1b457a5e10 am: 2fde855964 am: 6e7fcd48f5
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2286235

Change-Id: Id8931615071cab3ee2d520572f1d73be173e9e19
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-04 23:32:16 +00:00
Colin Cross
6e7fcd48f5 Add VariableFuncContext argument to VariableFuncs am: 1b457a5e10 am: 2fde855964
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2286235

Change-Id: I6ba6f89a19b1c94fd34b115e639ddd5f0861b7cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-04 22:44:46 +00:00
Colin Cross
2fde855964 Add VariableFuncContext argument to VariableFuncs am: 1b457a5e10
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2286235

Change-Id: I31c3a919ad66d0abd68bb77aeeca15f6467dd159
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-04 22:15:14 +00:00
Colin Cross
1b457a5e10 Add VariableFuncContext argument to VariableFuncs
Add a VariableFuncContext argument to VariableFuncs that implements
GlobWithDeps.  This will allow Soong to use optimized glob dependencies
in VariableFuncs.

Bug: 257079828
Test: no dependencies on directories in build.ninja.d
Change-Id: Iee5fc9c9ae3087662a5d1a3d7323a87462299205
2022-11-04 18:21:31 +00:00
Devin Moore
c938d3cd6e Merge "bpmodify: Add a set-bool flag to set single boolean values" am: 2a9208713e am: 6a817b84a2 am: feffd3cc82
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2275926

Change-Id: Idb79a4809a9054262f6aa196d6ae38be1d97906c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-28 22:52:12 +00:00
Devin Moore
feffd3cc82 Merge "bpmodify: Add a set-bool flag to set single boolean values" am: 2a9208713e am: 6a817b84a2
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2275926

Change-Id: Ic750d92c1e254e963e384a6374c4c7c2b92a1917
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-28 22:17:56 +00:00
Devin Moore
6a817b84a2 Merge "bpmodify: Add a set-bool flag to set single boolean values" am: 2a9208713e
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2275926

Change-Id: I2340390806878ca8355d16654a2dcef522be45be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-28 21:34:28 +00:00
Devin Moore
2a9208713e Merge "bpmodify: Add a set-bool flag to set single boolean values" 2022-10-28 20:54:06 +00:00
Devin Moore
753a555fdd bpmodify: Add a set-bool flag to set single boolean values
This is treated similar to other set commands, but add a single boolean
value to the property.

Test: bpmodify_test.go
Test: bpmodify -d -m android.hardware.drm -property frozen -set-bool
false Android.bp
Test: Same command above with "true" "misspelled" "1" for -set-bool
Bug: 231903487

Change-Id: I598da41a38409877af410f9715838d86b0873173
2022-10-28 18:46:51 +00:00
Lukács T. Berki
5027a87f7e Merge "Add order-only inputs for primary builder." am: 93bd28ae61 am: d2ad6f7305 am: 2304757986
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2273286

Change-Id: Id9938d703197cb19e0a364a9a19255610240cf95
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-28 09:05:01 +00:00
Lukács T. Berki
2304757986 Merge "Add order-only inputs for primary builder." am: 93bd28ae61 am: d2ad6f7305
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2273286

Change-Id: Idfa0f14ae23bee6bdefdb6d50d3e5e904c90b07a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-28 08:26:55 +00:00
Lukács T. Berki
d2ad6f7305 Merge "Add order-only inputs for primary builder." am: 93bd28ae61
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2273286

Change-Id: Ifddf21f5bcfef9091ed55c66f877fdcbaad894c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-28 07:39:37 +00:00
Lukács T. Berki
93bd28ae61 Merge "Add order-only inputs for primary builder." 2022-10-28 07:05:00 +00:00
Lukacs T. Berki
0acaefea0d Add order-only inputs for primary builder.
Test: Presubmits.
Change-Id: Iefe729f6874c1154c94d10563fb2fac3dc03049a
2022-10-27 08:05:27 +00:00
Treehugger Robot
e0a878dc1b Merge "cosmetics syntax simplification" am: 645184efb0 am: 08b3e92c5d am: c92dd1e3ec
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2250115

Change-Id: I480c2367a6104622b61b68b9dfa3294413c7875b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-26 16:55:09 +00:00
Treehugger Robot
c92dd1e3ec Merge "cosmetics syntax simplification" am: 645184efb0 am: 08b3e92c5d
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2250115

Change-Id: I6b596b4c6efc90c1e9ab7b0968ed609875705adb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-26 15:55:53 +00:00
Treehugger Robot
08b3e92c5d Merge "cosmetics syntax simplification" am: 645184efb0
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2250115

Change-Id: I5bded92ecd4c0432cb314a952687e0d691b4061a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-26 15:23:19 +00:00
Treehugger Robot
645184efb0 Merge "cosmetics syntax simplification" 2022-10-26 14:58:07 +00:00
Colin Cross
3f632ba502 Fix panic in parser when first token is invalid am: 31c10a12c8 am: 70f60abb28 am: 4a18fe662a
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2265904

Change-Id: I054a89f34c08666ace371469be9b5748ec0c33ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-22 01:08:27 +00:00
Colin Cross
4a18fe662a Fix panic in parser when first token is invalid am: 31c10a12c8 am: 70f60abb28
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2265904

Change-Id: Ida6e740f742ee68c005e0b7d86717d64723e2ef1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-22 00:36:36 +00:00
Colin Cross
70f60abb28 Fix panic in parser when first token is invalid am: 31c10a12c8
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2265904

Change-Id: I513ffffd28d0deb41be5d4d485e8c8d34027ef4b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-22 00:08:37 +00:00
Colin Cross
31c10a12c8 Fix panic in parser when first token is invalid
newParser was calling p.next(), which could trigger a scanner error
that results in a panic.  Move the first p.next() into parse(p), which
correctly converts the paanic into a reportable error.

Bug: 254831383
Test: TestParserError
Change-Id: I2a427010379bb8dd5087550c7f159499cbb84066
2022-10-21 14:38:52 -07:00
MarkDacek
2e38ef1848 Add staging mode to soong build. am: c5e959b244 am: 612884822d am: 61a98e320c
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2261143

Change-Id: I799252408a1d9b0a1df503f56a609dd3605f97d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-21 19:36:18 +00:00
MarkDacek
61a98e320c Add staging mode to soong build. am: c5e959b244 am: 612884822d
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2261143

Change-Id: Ia0d8715f7b8a948190de3ea88db23caa90c6e1a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-21 18:33:47 +00:00
MarkDacek
612884822d Add staging mode to soong build. am: c5e959b244
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2261143

Change-Id: I8e5cf66202d86990a367b9ae33acbea72cc67eb9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-21 18:05:25 +00:00
MarkDacek
c5e959b244 Add staging mode to soong build.
This is to build bazel targets that are nearing readiness for prod mode.

Bug: 254265047
Test: m nothing
Test: m nothing --bazel-mode-dev
Test: m nothing --bazel-mode-staging
Change-Id: Ie8336ec4ad70c0c9bd6d74f3b0a278c85fd5df2d
2022-10-18 20:35:45 +00:00
Usta Shrestha
63cad2c08f cosmetics syntax simplification
Bug: N/A
Test: m nothing
Change-Id: I9b34635ba145db568e185f795107c202e376f3c7
2022-10-12 01:59:07 +00:00
Lukacs T. Berki
ca97faccd2 Update README.md . am: ad9fbde7de am: 3c2ad7a014 am: e1c211521d
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2244814

Change-Id: I5a2392006c740c08e8693b17c8567d073bb20d0f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-10 11:42:28 +00:00
Lukacs T. Berki
e1c211521d Update README.md . am: ad9fbde7de am: 3c2ad7a014
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2244814

Change-Id: I2e3e9ae66ce8802893680087cebd353b073f6cc1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-10 11:09:15 +00:00
Lukacs T. Berki
3c2ad7a014 Update README.md . am: ad9fbde7de
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2244814

Change-Id: I2756b539518b67d762a91b37b0b6b61b8c7c0832
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-10 10:40:28 +00:00
Lukacs T. Berki
ad9fbde7de Update README.md .
Now that this is not plumbed to GitHub anymore, we can write things
specific to Android here.

Test: documentation change.
Change-Id: I11b65d56fdb519854d083bcf6f9c792cb2f59eb3
2022-10-10 07:06:22 +00:00
usta
f17eb6cb03 cosmetic: fail fast on empty module list am: 71ce3eae12 am: 9bc4b27cef am: d4cd9e3052 am: c7ea45527d am: 790ee79d44
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2219405

Change-Id: I2083ae689d41fc9906c9878dbee4d8ca464f5722
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-20 07:45:02 +00:00
usta
c3061a0209 cleanup: remove deprecated module ioutil am: 83ede83a31 am: b519ebb0b8 am: e08fe2741c am: 8f192e1ca3 am: f0c8db82b6
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2219404

Change-Id: I2f0a255a4cf7ac951886645286787190117cd459
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-20 07:43:53 +00:00
usta
790ee79d44 cosmetic: fail fast on empty module list am: 71ce3eae12 am: 9bc4b27cef am: d4cd9e3052 am: c7ea45527d
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2219405

Change-Id: I24e0e361659b4f37f44308c464b30c066bf0c881
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-20 07:12:43 +00:00
usta
f0c8db82b6 cleanup: remove deprecated module ioutil am: 83ede83a31 am: b519ebb0b8 am: e08fe2741c am: 8f192e1ca3
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2219404

Change-Id: Iede5690968eba382a28eefa8d6ce2ce81e843399
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-20 07:12:34 +00:00
usta
c7ea45527d cosmetic: fail fast on empty module list am: 71ce3eae12 am: 9bc4b27cef am: d4cd9e3052
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2219405

Change-Id: I4a50cd7fb062548a54e4078e7bda89cb79477caa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-20 06:45:48 +00:00
usta
8f192e1ca3 cleanup: remove deprecated module ioutil am: 83ede83a31 am: b519ebb0b8 am: e08fe2741c
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2219404

Change-Id: I63fb045be743c23bda5e33ff5b70174fc83b4c1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-20 06:45:38 +00:00
usta
d4cd9e3052 cosmetic: fail fast on empty module list am: 71ce3eae12 am: 9bc4b27cef
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2219405

Change-Id: I865e00fce3dde4f66deef119623c8dcd44af6eb5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-20 06:18:21 +00:00
usta
e08fe2741c cleanup: remove deprecated module ioutil am: 83ede83a31 am: b519ebb0b8
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2219404

Change-Id: Id2b82322eaa417d5f1b4a96d4f6423eddd225251
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-20 06:18:12 +00:00
usta
9bc4b27cef cosmetic: fail fast on empty module list am: 71ce3eae12
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2219405

Change-Id: I465597ab21dd852102a3fe09d7c751a6e1530621
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-20 05:49:17 +00:00
usta
b519ebb0b8 cleanup: remove deprecated module ioutil am: 83ede83a31
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2219404

Change-Id: I6adaf1e9e0d2af1ba8e0ddd6406276a41010b37d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-20 05:49:09 +00:00