Commit graph

2413 commits

Author SHA1 Message Date
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
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
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
59e154aa49 Merge "Add bazelmode and bazelmodedev as command args" am: 31ce118f0e am: 2113d66222
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2190180

Change-Id: Ibbd98e261392de8350f755ac59f7ad2491142be0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-30 15:25:17 +00:00
Christopher Parsons
2113d66222 Merge "Add bazelmode and bazelmodedev as command args" am: 31ce118f0e
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2190180

Change-Id: Idba0e94371924382a282fb936f0f901679edd385
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-30 14:55:37 +00:00
Christopher Parsons
31ce118f0e Merge "Add bazelmode and bazelmodedev as command args" 2022-08-30 14:29:30 +00:00
MarkDacek
c3cd9cc2d6 Add LSC tool meant for remediating module/file collisions. am: c3eb9199b2 am: 98777cb8d5
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2193718

Change-Id: I857f150f72cbd886f8c3643117bee42ede8a64a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-29 19:42:06 +00:00
MarkDacek
98777cb8d5 Add LSC tool meant for remediating module/file collisions. am: c3eb9199b2
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2193718

Change-Id: I677f89890ac0c8f8100d9b43bf2d2bff8c1d4aad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-29 19:00:56 +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
Usta Shrestha
c65173c57d 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" am: 513e27a6a6 am: d9a1e7d66b
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2181555

Change-Id: I940bdc0c1fe0751981a2653a026ee705ede94d39
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-19 16:31:30 +00:00
Usta Shrestha
d9a1e7d66b 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" am: 513e27a6a6
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2181555

Change-Id: I2ad2ad8d3422fd109898fa0b42f6777a84e84c93
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-19 16:11:26 +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
9482312647 added tests for move-property in bpmodify am: 30751b313c am: 8e5808e747
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2182736

Change-Id: Ie8617d00eb03a1bb37f3660946d16097915cce8b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-11 15:30:03 +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
63dab80715 Add functionality for replacing string values. am: c93385a75a am: e1055bb941
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2181015

Change-Id: If838601004585a8c1c71039c83cbd1d2f6b61a96
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-10 15:55:32 +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
c08c30d94c Merge "move microfactory main.main() to microfactory.bash" am: 5233841b7a am: b4bf67a92d
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2179719

Change-Id: I4629b0245f67149ffc4beb765bbac07f66e5d175
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-09 19:41:00 +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
3874c6452e Merge "Fix misspelling. Oversight from the CL split after rebasing. Test: N/A" am: 49cd656217 am: ed1f44cad7
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2179679

Change-Id: I25c4d49fb66ddec529f27526dd92b52676249656
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-09 15:41:41 +00:00
Mark Dacek
53a437279b 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 am: df452c60d1
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2176153

Change-Id: I6e3653a7979c7f77d19c26417a66366ace2aa467
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-09 15:40:03 +00: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
91bc4bbe6a Merge "Revert "Add support for maps in blueprint files."" am: 2da2f30ce4 am: ab0d9b3979
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2172123

Change-Id: I75e0a0055c221163422f1e2c688f6ec3ef88faaa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-09 12:57:32 +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
8399b71de0 changed newLocation option to be new-location in bpmodify am: ab1bac0e12 am: d121a7b5d4
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2175958

Change-Id: I21f2ccdec0f5bfd68e514e3a7f5ff80f53a08665
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-05 22:14:41 +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
5297dd9ca1 Fix bpmodify Android.bp definition am: c2753f9bfa am: 4f5ffbf432
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2173002

Change-Id: I74bda69ff1e0224c1b27a05780cc0789bd4365a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-04 20:30:28 +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
572910c04b added moveProperty contents functionality to bpmodify am: 145d5a8c83 am: 0c596ddce9
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2104746

Change-Id: I3e4afe619932f5163136cf5a60d0c9efbc264e53
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-27 19:01:38 +00: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
720cbde1a8 [automerger skipped] DO NOT MERGE - Empty merge of tm-dev-plus-aosp-without-vendor@8763363 am: e876fce0c3 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/blueprint/+/19090116

Change-Id: I38ba9eed807b068661ecf0991503731d8385986e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-28 01:48:15 +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
86c65ecafd Add godoc for TransitionMutator. am: e76d4122ee am: 0c5cd475c1
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2134474

Change-Id: I86780d89477b62e00d8e0099c95481110a66ee12
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-27 07:28:54 +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