Commit graph

2401 commits

Author SHA1 Message Date
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
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
622e95fb44 [automerger skipped] DO NOT MERGE - Empty merge of tm-dev-plus-aosp-without-vendor@8763363 am: e876fce0c3 -s ours am: 720cbde1a8 -s ours am: 695887b665 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I73b6c2fd97653143ab02435c4532fbef819720bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-28 02:53:00 +00:00
Xin Li
695887b665 [automerger skipped] DO NOT MERGE - Empty merge of tm-dev-plus-aosp-without-vendor@8763363 am: e876fce0c3 -s ours am: 720cbde1a8 -s ours
am skip reason: subject contains skip directive

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

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

Change-Id: I3c28fd1385842b9856cf79d8fb3a3958b3323a14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-27 08:18:07 +00:00
Lukacs T. Berki
ed2a4e989d Add godoc for TransitionMutator. am: e76d4122ee am: 0c5cd475c1 am: 86c65ecafd
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2134474

Change-Id: I7345d4705236d693130c9057a9808b3e408beec3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-27 07:55:36 +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
Bob Badour
e67bd077a0 Add NinjaAndShellEscapeIncludingSpaces am: 2a62643266 am: c5a0b4b5a1 am: e5e190bd21 am: ea2ed81f5b
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2132413

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

Change-Id: Iff31aab61bb28870b8d3bcdd724d23cf4d188a86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-21 21:17:28 +00: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
e1ed6feed5 Implement transition mutators. am: eb641de659 am: c820666d8b am: 87c247b428 am: e8b63cfc22
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2123296

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

Change-Id: Ia72c1bfca44033a146904e83db0f1599f3dcdde8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-18 20:37:08 +00: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
ee0e8d0a28 recommend a EventHandler.Do() am: 2a95e590b6 am: 0ca2d0cb67 am: 36551c5a13 am: b32f848409
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2095267

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

Change-Id: I5c4aa98bfc3fac5032fdbd95062ce93926aa1bff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-31 17:40:39 +00: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
6caf9b8aea Merge "Allow users to specify extra json action data" am: 57d5937e6f am: 13a7388e46 am: b84b3ed83a am: 6a689cd7d1
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2108469

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

Change-Id: I59272f83ce9e08ae082186cbf70f50c4553598d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 14:32:24 +00: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
6dd403f9f1 Merge "Add info to json module graph about CreateModule" am: 54c00c6618 am: fcfc7e2f1a am: 23258206f4 am: c8f24384e6
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2085745

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

Change-Id: Ie1012ddab2198818c257dd9107adca2a87ab9614
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-24 20:56:40 +00: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
66c081491f Merge "Support pre-build-action hook in blueprint" am: df4ad24151 am: 94222dc0f7 am: eb83859840 am: 3d7627ee58
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2094704

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

Change-Id: Ie60371fe96b9522f4462fc8f6cc6fe035d928bda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 16:32:20 +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
f0c099bb31 Allow deferred module build action generation. am: 67a6d702d1 am: 1739902dcf am: d3f68a1702 am: b29a7c6c33
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/2099161

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

Change-Id: I247d0c021bfde0f4147aa7a54c1532b9b23fefa3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-19 19:30:54 +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