Commit graph

2400 commits

Author SHA1 Message Date
Treehugger Robot
645184efb0 Merge "cosmetics syntax simplification" 2022-10-26 14:58:07 +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
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
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
71ce3eae12 cosmetic: fail fast on empty module list
also minor refactoring to limit var scopes

Test: m nothing and ensure ninja files are generated
Bug: N/A
Change-Id: If7bdede4e54687955896b03ab11ef771855d2225
2022-09-20 05:15:24 +00:00
usta
83ede83a31 cleanup: remove deprecated module ioutil
Test: m nothing and check bootstrap.ninja and build.ninja file
Bug: N/A
Change-Id: I8c2f2d8cb452955921b2287ec2c621909ebde5e4
2022-09-20 05:13:27 +00:00
Christopher Parsons
31ce118f0e Merge "Add bazelmode and bazelmodedev as command args" 2022-08-30 14:29:30 +00:00
MarkDacek
c3eb9199b2 Add LSC tool meant for remediating module/file collisions.
See b/198619163
Test: ./rename_module_and_deps.py art/tools/ahat/ahat

Change-Id: Ie2274701128befb6dd574ad674d1b494d77edd8c
2022-08-29 16:07:29 +00:00
Chris Parsons
a034bea7e9 Add bazelmode and bazelmodedev as command args
Test: See attached topic CLs
Change-Id: I7a6290702f6cd721ef5f67e885b3dfc4b98edeb0
2022-08-19 11:35:54 -04:00
Usta Shrestha
513e27a6a6 Merge "Edit bpmodify to check Android. files and use '=' as the separator for replacements. Test: go test -v and running bpmodify with the LSC tool" 2022-08-19 15:09:10 +00:00
MarkDacek
2b70006b32 Edit bpmodify to check Android. files and use '=' as the separator for
replacements.
Test: go test -v and running bpmodify with the LSC tool

Change-Id: I63741cce66179962e454f9a002bf358bf054c267
2022-08-17 18:54:16 +00:00
Alix
8e5808e747 added tests for move-property in bpmodify am: 30751b313c
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2182736

Change-Id: If424cd5d43794937d94b7a6b49571bbf0243cb0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-11 15:02:57 +00:00
Alix
30751b313c added tests for move-property in bpmodify
Test: m nothing
Signed-off-by: Alix <agespino@google.com>
Change-Id: Ib8f1e88f7587476845e64a9d9ff96afb2b8d2df8
2022-08-11 02:44:02 +00:00
MarkDacek
e1055bb941 Add functionality for replacing string values. am: c93385a75a
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2181015

Change-Id: I01d17d6316210bed552ebcb77372380ca32ab301
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-10 14:39:45 +00:00
MarkDacek
c93385a75a Add functionality for replacing string values.
Test: go test -v

Change-Id: I8e59bd1dc319d06c5645c6f288df46702901573b
2022-08-09 23:33:22 +00:00
Treehugger Robot
b4bf67a92d Merge "move microfactory main.main() to microfactory.bash" am: 5233841b7a
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2179719

Change-Id: I1f414374ba3128ceb712b910ab1879075c9922fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-09 18:50:11 +00:00
Treehugger Robot
5233841b7a Merge "move microfactory main.main() to microfactory.bash" 2022-08-09 18:27:05 +00:00
Usta Shrestha
d5b704c089 move microfactory main.main() to microfactory.bash
package renaming and addition of func main() both done in the same place for clarity

Test: m nothing
Bug: N/A
Change-Id: Icc7d18033fe6049001007fb35271335f19395b8a
2022-08-09 13:04:33 -04:00
Usta Shrestha
ed1f44cad7 Merge "Fix misspelling. Oversight from the CL split after rebasing. Test: N/A" am: 49cd656217
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2179679

Change-Id: I36c9adfcc14ee3d87f0ddfadc8b9e3c7fe56c149
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-09 15:20:24 +00:00
Mark Dacek
df452c60d1 Merge "Add multiple property and replace functionality to bpmodify. Test: go run bpmodify.go -w -m=libcore-memory-metrics-tests -property=something,static_libs,deps,required,test_suites -replace-property=ahat:ahat_lib,general-tests:something -s ~/aosp-master-with-phones/libcore/metrictests/memory/host/Android.bp go test -v" am: 562ed0d84f
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2176153

Change-Id: I322d6b3e50cc5cb9523ca04485202858cf1fe330
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-09 15:20:14 +00:00
Usta Shrestha
49cd656217 Merge "Fix misspelling. Oversight from the CL split after rebasing. Test: N/A" 2022-08-09 14:40:35 +00:00
MarkDacek
14349ea8b8 Fix misspelling. Oversight from the CL split after rebasing.
Test: N/A

Change-Id: I164990624e54bc234f5b9802345addd459e2c249
2022-08-09 14:38:16 +00:00
Mark Dacek
562ed0d84f Merge "Add multiple property and replace functionality to bpmodify. Test: go run bpmodify.go -w -m=libcore-memory-metrics-tests -property=something,static_libs,deps,required,test_suites -replace-property=ahat:ahat_lib,general-tests:something -s ~/aosp-master-with-phones/libcore/metrictests/memory/host/Android.bp go test -v" 2022-08-09 14:37:00 +00:00
Treehugger Robot
ab0d9b3979 Merge "Revert "Add support for maps in blueprint files."" am: 2da2f30ce4
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2172123

Change-Id: I7d7d2aa7d42c1626b6f5e6f58b97674cd24572b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-09 12:32:19 +00:00
Treehugger Robot
2da2f30ce4 Merge "Revert "Add support for maps in blueprint files."" 2022-08-09 12:09:13 +00:00
MarkDacek
856507f4d2 Add multiple property and replace functionality to bpmodify.
Test: go run bpmodify.go -w -m=libcore-memory-metrics-tests -property=something,static_libs,deps,required,test_suites -replace-property=ahat:ahat_lib,general-tests:something -s ~/aosp-master-with-phones/libcore/metrictests/memory/host/Android.bp
go test -v

Change-Id: I005b6dd675beb205f544e89c729fe9191e6470c2
2022-08-08 17:58:11 +00:00
Alix
d121a7b5d4 changed newLocation option to be new-location in bpmodify am: ab1bac0e12
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2175958

Change-Id: Iaf9cd3874c584caed3ded540e6edcf1ce935a90c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-05 21:49:41 +00:00
Alix
ab1bac0e12 changed newLocation option to be new-location in bpmodify
This is more consitant with other options in bpmodify

Test: ran manually
Change-Id: Ia0d267bdd3c67c53e72ef6556ff253eab0ae9a68
2022-08-05 14:27:54 +00:00
Chris Parsons
4f5ffbf432 Fix bpmodify Android.bp definition am: c2753f9bfa
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2173002

Change-Id: I214664bde324d9cc791cfbb656ce6dc8475b8da2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-04 20:01:50 +00:00
Chris Parsons
c2753f9bfa Fix bpmodify Android.bp definition
With this fix, running `m bpmodify` will correctly generate a go binary
at out/host/linux-x86/bin/bpmodify, after running tests in
bpmodify_test.go.

Test: m bpmodify
Change-Id: I42be5a366891b51a559d39d72d2b013e3a115492
2022-08-02 15:25:59 -04:00
Usta Shrestha
290e675625 Revert "Add support for maps in blueprint files."
This reverts commit 42cb28f66e.

Reason for revert: Dead code - map type properties in Module

Change-Id: Ie944a311963cc54258cbc4ba3fc974882e5539ce
2022-08-02 10:55:21 -04:00
Alix
0c596ddce9 added moveProperty contents functionality to bpmodify am: 145d5a8c83
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2104746

Change-Id: I92f180bc104673f8827bcb84a6e6b0a955ed357d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-27 18:45:26 +00:00
Alix
145d5a8c83 added moveProperty contents functionality to bpmodify
bpmodify can know move the contents of a property into another
property using moveProperty. After moving the contents, the original
property is deleted.

Bug: 226636335
Change-Id: Id68d11d59f00909b4c93aa78666d14f433f236fb
Test: manually ran on several Android.bp files in bug 226636335
2022-07-25 19:38:40 +00:00
Xin Li
e876fce0c3 DO NOT MERGE - Empty merge of tm-dev-plus-aosp-without-vendor@8763363
Merged-In: Ic52fbdb64042148d851403b4afd2dd5392282f77
Change-Id: I333f02efcee7c3c19f076c5c2d19b2f3755ea216
2022-06-27 23:25:43 +00:00
Lukacs T. Berki
0c5cd475c1 Add godoc for TransitionMutator. am: e76d4122ee
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2134474

Change-Id: Ia7c54a9883ff27c165a66449a0f564ad212f625c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-27 07:11:19 +00:00
Lukacs T. Berki
e76d4122ee Add godoc for TransitionMutator.
Test: Presubmits.
Change-Id: I5eba0a4f4d4653a36ff52ed81ee101461ff92b5d
2022-06-27 08:51:58 +02:00
Bob Badour
e5e190bd21 Add NinjaAndShellEscapeIncludingSpaces am: 2a62643266 am: c5a0b4b5a1
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2132413

Change-Id: I8515242e5734771ba4a2f12cf6daf9bfe0c9f2d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-21 20:51:32 +00:00
Bob Badour
c5a0b4b5a1 Add NinjaAndShellEscapeIncludingSpaces am: 2a62643266
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2132413

Change-Id: I4f3c18d52198507929a93850cdc8053ea76dc124
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-21 20:24:17 +00:00
Bob Badour
2a62643266 Add NinjaAndShellEscapeIncludingSpaces
Bug: 235333302

Test: m droid dist
Change-Id: Ic52fbdb64042148d851403b4afd2dd5392282f77
2022-06-21 11:10:16 -07:00
Lukacs T. Berki
87c247b428 Implement transition mutators. am: eb641de659 am: c820666d8b
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2123296

Change-Id: I82bbc8ad29af9152c627a551a5c886d75f5779cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-18 20:17:49 +00:00
Lukacs T. Berki
c820666d8b Implement transition mutators. am: eb641de659
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2123296

Change-Id: I78ba253631489b427f64f321f0cefde823cb6757
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-18 19:46:32 +00:00
Lukacs T. Berki
eb641de659 Implement transition mutators.
These are more limited than bottom-up or top-down mutators but in
exchange have some pleasant properties:

- "variant not found" errors are impossible
- The logic is pleasantly split into multiple, mostly orthogonal
  parts
- Theoretically, if every mutator is refactored like this, they
  make it possible to partially cache the module graph
- Are quite close to a "configuration transition" in Bazel.

Bug: 231370928
Test: Presubmits.
Change-Id: Idcdb66b5ea75c0d2838f527aaa988df3b12553d8
2022-06-17 17:51:04 +02:00
Usta Shrestha
36551c5a13 recommend a EventHandler.Do() am: 2a95e590b6 am: 0ca2d0cb67
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2095267

Change-Id: Ie3562a5645b24559b5b9ff7292262ea4c3ab0e09
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-31 16:54:18 +00:00
Usta Shrestha
0ca2d0cb67 recommend a EventHandler.Do() am: 2a95e590b6
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2095267

Change-Id: Id932c62693ec48b264d855a0cdf7559718f00b81
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-31 16:11:02 +00:00
Usta Shrestha
2a95e590b6 recommend a EventHandler.Do()
Test: manually verified equivalence
Bug: N/A
Change-Id: I2a5abd5b1230ab1f1b5851672e80833c5d18d5c7
2022-05-27 15:39:16 -04:00
Treehugger Robot
b84b3ed83a Merge "Allow users to specify extra json action data" am: 57d5937e6f am: 13a7388e46
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2108469

Change-Id: I5537fb1b2dca354af3874f0d9be5103cb2bde6f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 14:09:48 +00:00
Treehugger Robot
13a7388e46 Merge "Allow users to specify extra json action data" am: 57d5937e6f
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2108469

Change-Id: I60c17451481ca3955e0f18270d531c773c0fd14e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 13:53:20 +00:00
Treehugger Robot
57d5937e6f Merge "Allow users to specify extra json action data" 2022-05-27 13:29:54 +00:00
Liz Kammer
d625c97587 Allow users to specify extra json action data
Test: m json-module-graph and validate output
Change-Id: I7ff7c2c98e49f515efb19845aa3a860e14360a32
2022-05-26 16:17:35 -04:00