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
3c42ffdb80
Merge "move microfactory main.main() to microfactory.bash" am: 5233841b7a
am: b4bf67a92d
am: c08c30d94c
am: 45cb422da1
am: d14bb35ceb
...
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2179719
Change-Id: I28bfd0fe1569b64905dc249b93a9c1a7b6b6fa9c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-09 21:10:00 +00:00
Treehugger Robot
d14bb35ceb
Merge "move microfactory main.main() to microfactory.bash" am: 5233841b7a
am: b4bf67a92d
am: c08c30d94c
am: 45cb422da1
...
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2179719
Change-Id: I7028e06433e6a4620c12f0dd6d268454f46a01c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-09 20:24:32 +00:00
Treehugger Robot
45cb422da1
Merge "move microfactory main.main() to microfactory.bash" am: 5233841b7a
am: b4bf67a92d
am: c08c30d94c
...
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2179719
Change-Id: Ia0c51e5e0392c4c6ff0efafff4ef147c7495f36c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-09 20:06:41 +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
c7aef1e12e
Merge "Fix misspelling. Oversight from the CL split after rebasing. Test: N/A" am: 49cd656217
am: ed1f44cad7
am: 3874c6452e
am: 7ac8343498
am: 036de0c253
...
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2179679
Change-Id: I3f6f42d8bb6e604081d8d8436f223a2d6d1dea87
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-09 17:14:30 +00:00
Mark Dacek
c707e6440c
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
am: 53a437279b
am: 336affdae7
am: 112bc52976
...
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2176153
Change-Id: Iee0e5c98345da25dca040be5bf28616cd3f59d44
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-09 17:14:18 +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
036de0c253
Merge "Fix misspelling. Oversight from the CL split after rebasing. Test: N/A" am: 49cd656217
am: ed1f44cad7
am: 3874c6452e
am: 7ac8343498
...
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2179679
Change-Id: Ie15c154760428fe320ed79cf9cc62a18c0280fd9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-09 16:51:33 +00:00
Mark Dacek
112bc52976
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
am: 53a437279b
am: 336affdae7
...
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2176153
Change-Id: Idd8773b7d129f9891288be730d589b01c2e0e993
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-09 16:49:53 +00:00
Usta Shrestha
7ac8343498
Merge "Fix misspelling. Oversight from the CL split after rebasing. Test: N/A" am: 49cd656217
am: ed1f44cad7
am: 3874c6452e
...
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2179679
Change-Id: I14da62f9c89b243fcc2de0865aa11237735fac96
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-09 16:27:47 +00:00
Mark Dacek
336affdae7
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
am: 53a437279b
...
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2176153
Change-Id: Ib5429f34544eebc23ef15b0d83d7ac361f57145d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-09 16:25:18 +00: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
ac6a21d0c6
Merge "Revert "Add support for maps in blueprint files."" am: 2da2f30ce4
am: ab0d9b3979
am: 91bc4bbe6a
am: 21e0ab42fe
am: 0f1496a1f3
...
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2172123
Change-Id: I6639b77ee7f22f4984a52471f2f6d0878bb19255
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-09 14:24:46 +00:00
Treehugger Robot
0f1496a1f3
Merge "Revert "Add support for maps in blueprint files."" am: 2da2f30ce4
am: ab0d9b3979
am: 91bc4bbe6a
am: 21e0ab42fe
...
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2172123
Change-Id: I2718964ca319cdcd47caca11a73ce17d1e67d566
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-09 13:58:49 +00:00
Treehugger Robot
21e0ab42fe
Merge "Revert "Add support for maps in blueprint files."" am: 2da2f30ce4
am: ab0d9b3979
am: 91bc4bbe6a
...
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2172123
Change-Id: Ia261a6163a92f989eb03781ce0adf52bf129f583
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-09 13:34:12 +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
bf19191d64
changed newLocation option to be new-location in bpmodify am: ab1bac0e12
am: d121a7b5d4
am: 8399b71de0
am: b954d4502a
am: daedd01a62
...
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2175958
Change-Id: Ib1a2cdcf88df0d9d3f5fb3c95494c768b65e227d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-06 02:18:17 +00:00
Alix
daedd01a62
changed newLocation option to be new-location in bpmodify am: ab1bac0e12
am: d121a7b5d4
am: 8399b71de0
am: b954d4502a
...
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2175958
Change-Id: I009d4ed38e1aaf1f5411401af2aaca3471bc1a6f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-05 23:34:52 +00:00
Alix
b954d4502a
changed newLocation option to be new-location in bpmodify am: ab1bac0e12
am: d121a7b5d4
am: 8399b71de0
...
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2175958
Change-Id: Ic160bbc9be1f8dd38cd599888b1f26e427de3874
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-05 22:40:57 +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
b43041e8cf
Fix bpmodify Android.bp definition am: c2753f9bfa
am: 4f5ffbf432
am: 5297dd9ca1
am: 3c1a30001f
am: 072979a350
...
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2173002
Change-Id: Id88148039552977d22590cc01c38872e0ea32cf8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-04 21:35:38 +00:00
Chris Parsons
072979a350
Fix bpmodify Android.bp definition am: c2753f9bfa
am: 4f5ffbf432
am: 5297dd9ca1
am: 3c1a30001f
...
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2173002
Change-Id: Id059fbaa183dd0976b6d607ae0714b5ea19c1db4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-04 21:12:21 +00:00
Chris Parsons
3c1a30001f
Fix bpmodify Android.bp definition am: c2753f9bfa
am: 4f5ffbf432
am: 5297dd9ca1
...
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2173002
Change-Id: I289e9d492c268b44b82d3519a5d2e406bbbd36f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-04 20:48:49 +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
Bob Badour
334e205dc3
[automerger skipped] Add NinjaAndShellEscapeIncludingSpaces am: 7968c52625
-s ours
...
am skip reason: Merged-In Ic52fbdb64042148d851403b4afd2dd5392282f77 with SHA-1 2a62643266
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/blueprint/+/19519917
Change-Id: I5180a12478ccf164c053f94914afffd66fc92fb0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-04 00:18:25 +00:00
Bob Badour
1b5fd2bf57
[automerger skipped] Allow deferred module build action generation. am: bb076fdcc3
-s ours
...
am skip reason: Merged-In I82ed218926b1d8fbe2edde6d55c4bf40ea0d8618 with SHA-1 67a6d702d1
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/blueprint/+/19519916
Change-Id: I74cc6a296c2d7b80cd494e494991afafc8bcf2ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-04 00:18:23 +00:00
Bob Badour
7968c52625
Add NinjaAndShellEscapeIncludingSpaces
...
Bug: 235333302
Bug: 240342946
Test: m droid dist
Change-Id: Ic52fbdb64042148d851403b4afd2dd5392282f77
Merged-in: Ic52fbdb64042148d851403b4afd2dd5392282f77
2022-08-03 14:02:31 -07:00
Bob Badour
bb076fdcc3
Allow deferred module build action generation.
...
Provide a means to generate build actions for modules from within the
later singleton context. Allows modules to depend on the metadata for
arbitrary modules without causing dependency cycles.
Care needs to be taken to establish all metadata during the normal
module GenerateBuildAction to avoid synchronization issues and only
use read-only access to modules from the singleton context.
Bug: 213388645
Bug: 240342946
Test: m droid dist
Change-Id: I82ed218926b1d8fbe2edde6d55c4bf40ea0d8618
Merged-in: I82ed218926b1d8fbe2edde6d55c4bf40ea0d8618
2022-08-03 14:02:30 -07: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
d7b6c782a9
added moveProperty contents functionality to bpmodify am: 145d5a8c83
am: 0c596ddce9
am: 572910c04b
am: c9cfb8e458
am: c98627cc8f
...
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2104746
Change-Id: I5ff7666b7c4c52584a1999c150a687cf1756d5c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-27 20:33:47 +00:00
Alix
c98627cc8f
added moveProperty contents functionality to bpmodify am: 145d5a8c83
am: 0c596ddce9
am: 572910c04b
am: c9cfb8e458
...
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2104746
Change-Id: I0be14b1018580a26a326b590926737084ac93f3c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-27 20:09:12 +00:00
Alix
c9cfb8e458
added moveProperty contents functionality to bpmodify am: 145d5a8c83
am: 0c596ddce9
am: 572910c04b
...
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2104746
Change-Id: I0659bbbad904a6c90b2df4a7612c143c3a85f4fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-27 19:45:16 +00: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