tequilaOS/platform_build_blueprint
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
2386 commits 1 branch 0 tags 7.4 MiB
Commit graph

2386 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Treehugger Robot
23258206f4 Merge "Add info to json module graph about CreateModule" am: 54c00c6618 am: fcfc7e2f1a 
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2085745

Change-Id: If35894e26aba7d3111250bbc21b4f53046f80253
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-24 20:28:22 +00:00
Treehugger Robot
fcfc7e2f1a Merge "Add info to json module graph about CreateModule" am: 54c00c6618 
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2085745

Change-Id: I3d72faa70682212c5f76cff0f513c208698bd130
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-24 19:45:19 +00:00
Treehugger Robot
54c00c6618 Merge "Add info to json module graph about CreateModule" 2022-05-24 19:20:28 +00:00
Christopher Parsons
eb83859840 Merge "Support pre-build-action hook in blueprint" am: df4ad24151 am: 94222dc0f7 
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2094704

Change-Id: Ie7b1a33da013cd7b78f2c22e8a94295f70d0f6b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 16:15:37 +00:00
Christopher Parsons
94222dc0f7 Merge "Support pre-build-action hook in blueprint" am: df4ad24151 
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2094704

Change-Id: Iea76743f2ae4fa3e5691092722f956df49d201cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-20 15:52:30 +00:00
Christopher Parsons
df4ad24151 Merge "Support pre-build-action hook in blueprint" 2022-05-20 14:13:49 +00:00
Bob Badour
d3f68a1702 Allow deferred module build action generation. am: 67a6d702d1 am: 1739902dcf 
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2099161

Change-Id: Ibe2775cfb6af169603ccd9ec9cb1141271ed80c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-19 19:09:45 +00:00
Bob Badour
1739902dcf Allow deferred module build action generation. am: 67a6d702d1 
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2099161

Change-Id: I98824aff0318e2923515327ab165d7f4c4dd408a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-19 18:47:56 +00:00
Bob Badour
67a6d702d1 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

Change-Id: I82ed218926b1d8fbe2edde6d55c4bf40ea0d8618
 2022-05-18 17:59:16 -07:00
Treehugger Robot
87642d1daf Merge "Add a filelock for in-place case" am: cdbab1ea51 am: 4bb43ed7a2 
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2092123

Change-Id: Iafa406ca58dd9c129ff5823a4d09254ff971f82e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-13 20:41:58 +00:00
Treehugger Robot
4bb43ed7a2 Merge "Add a filelock for in-place case" am: cdbab1ea51 
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2092123

Change-Id: Ic1fecda84792216985d366c40e2b8afbecfdf58c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-13 19:50:05 +00:00
Chris Parsons
91f638f692 Support pre-build-action hook in blueprint 
This allows for a bazel-invocation hook in mixed builds, which allows
for mixed builds to take place in only a single pass, greatly improving
its performance and complexity.

Test: Conjunction with build/soong CL
Change-Id: If89fb56830b4eb06d3263d6ca6da7b285e7ba315
 2022-05-10 13:46:40 -04:00
Treehugger Robot
cdbab1ea51 Merge "Add a filelock for in-place case" 2022-05-10 04:06:52 +00:00
Jeongik Cha
28c7996f2c Add a filelock for in-place case 
Multiple bpmodify process on the same Android.bp can run in parallel in
the case of aidl-freeze-api.

So, add a file lock for in-place editing case(-w)

Bug: 229413853
Test: run bpmodify in parallel and check result
Change-Id: I5368b0304b59f34fff60025120b38cc5f615ac40
 2022-05-10 01:30:08 +00:00