Commit graph

2418 commits

Author SHA1 Message Date
kgui
f9e936b3c4 Support writing inputs/outputs of actions of modules into a file from the moduleInfo.actionDefs. am: a78b020089 am: 6fb018a456 am: 33eafd0d60 am: d246a146ee
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1959132

Change-Id: Ia8256f9afb096110c9b50126fe3bcd5a512cbfcf
2022-01-28 15:55:46 +00:00
kgui
d246a146ee Support writing inputs/outputs of actions of modules into a file from the moduleInfo.actionDefs. am: a78b020089 am: 6fb018a456 am: 33eafd0d60
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1959132

Change-Id: Ifa92a1ea155c140094e33eb636df23f671a9ca2b
2022-01-28 15:36:05 +00:00
kgui
33eafd0d60 Support writing inputs/outputs of actions of modules into a file from the moduleInfo.actionDefs. am: a78b020089 am: 6fb018a456
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1959132

Change-Id: I2d8624237baff7507a1e248525c1e10f2672f7d9
2022-01-28 15:24:44 +00:00
kgui
6fb018a456 Support writing inputs/outputs of actions of modules into a file from the moduleInfo.actionDefs. am: a78b020089
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1959132

Change-Id: I1fd8c94610b3cf1cd669a5f29d3ef8d277426417
2022-01-28 15:07:45 +00:00
kgui
a78b020089 Support writing inputs/outputs of actions of modules into a file from the moduleInfo.actionDefs.
An example module variant in the module-actions.json:
{
	"Name": "metalava-gradle-plugin-deps",
	"Variations": null,
	"DependencyVariations": null,
	"Deps": [
		{
			"Name": "prebuilts_gradle-plugin_license",
			"Variations": null,
			"DependencyVariations": null,
			"Tag": ""
		}
	],
	"Type": "",
	"Blueprint": "prebuilts/gradle-plugin/Android.bp",
	"Module": {
		"Actions": [
			{
				"Inputs": [
					"prebuilts/gradle-plugin/com/android/tools/lint/lint-api/30.1.0-alpha13/lint-api-30.1.0-alpha13.jar",
					"prebuilts/gradle-plugin/com/android/tools/lint/lint-checks/30.1.0-alpha13/lint-checks-30.1.0-alpha13.jar",
					"prebuilts/gradle-plugin/com/android/tools/lint/lint/30.1.0-alpha13/lint-30.1.0-alpha13.jar",
					"prebuilts/gradle-plugin/com/android/tools/lint/lint-gradle/30.1.0-alpha13/lint-gradle-30.1.0-alpha13.jar",
					"prebuilts/gradle-plugin/com/android/tools/lint/lint-model/30.1.0-alpha13/lint-model-30.1.0-alpha13.jar",
					"prebuilts/gradle-plugin/com/android/tools/common/30.1.0-alpha13/common-30.1.0-alpha13.jar",
					"prebuilts/gradle-plugin/com/android/tools/sdk-common/30.1.0-alpha13/sdk-common-30.1.0-alpha13.jar",
					"prebuilts/gradle-plugin/com/android/tools/sdklib/30.1.0-alpha13/sdklib-30.1.0-alpha13.jar",
					"prebuilts/gradle-plugin/com/android/tools/external/org-jetbrains/uast/30.1.0-alpha13/uast-30.1.0-alpha13.jar",
					"prebuilts/gradle-plugin/com/android/tools/external/com-intellij/intellij-core/30.1.0-alpha13/intellij-core-30.1.0-alpha13.jar",
					"prebuilts/gradle-plugin/com/android/tools/external/com-intellij/kotlin-compiler/30.1.0-alpha13/kotlin-compiler-30.1.0-alpha13.jar",
					"prebuilts/gradle-plugin/com/android/tools/repository/30.1.0-alpha13/repository-30.1.0-alpha13.jar",
					"prebuilts/gradle-plugin/com/android/tools/build/manifest-merger/30.1.0-alpha13/manifest-merger-30.1.0-alpha13.jar"
				],
				"Outputs": [
					"out/soong/.intermediates/prebuilts/gradle-plugin/metalava-gradle-plugin-deps/linux_glibc_common/combined/metalava-gradle-plugin-deps.jar"
				]
			},
			{
				"Inputs": null,
				"Outputs": [
					"out/soong/.intermediates/prebuilts/gradle-plugin/metalava-gradle-plugin-deps/linux_glibc_common/meta_lic"
				]
			}
		]
	}
}

Test: local
Change-Id: Icbb7236507251e257f6773b110ae8a0788eef41e
2022-01-28 14:50:24 +08:00
Treehugger Robot
24033ae18a Merge "Add support for maps in blueprint files." am: 00895de89a am: 43eaa934b8 am: 519f7c137b am: b532e5154f
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1718095

Change-Id: I2d4d43ebbb6b86621e65a80204a7d98f7536a29d
2022-01-27 23:24:23 +00:00
Treehugger Robot
b532e5154f Merge "Add support for maps in blueprint files." am: 00895de89a am: 43eaa934b8 am: 519f7c137b
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1718095

Change-Id: I42b69c5222945379719ab1459b5239ca57c8fc84
2022-01-27 23:08:14 +00:00
Treehugger Robot
519f7c137b Merge "Add support for maps in blueprint files." am: 00895de89a am: 43eaa934b8
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1718095

Change-Id: I39b3ae89cffcb1974f514cdd49e01bb723336df5
2022-01-27 22:37:02 +00:00
Treehugger Robot
43eaa934b8 Merge "Add support for maps in blueprint files." am: 00895de89a
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1718095

Change-Id: I56d4b5f7584de110682acaf275eb7a71d243e548
2022-01-27 22:22:44 +00:00
Treehugger Robot
00895de89a Merge "Add support for maps in blueprint files." 2022-01-27 21:36:45 +00:00
Liz Kammer
42cb28f66e Add support for maps in blueprint files.
This limits support to allow-listed property names to prevent
proliferation of map types requiring additional support to migrate.

Test: go test blueprint tests
Test: m nothing && diff build.ninja & Android-aosp_arm.mk -- no changes
Change-Id: Id12637462f19ac5de1b562f63507de989a51600d
2022-01-26 12:18:31 -05:00
Usta Shrestha
ad50e3afb1 Blueprint to support multiline (Go style raw) strings am: 53bc344a81 am: 2f2ec92037 am: 12dbce42c3 am: ac11e1290f
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1953722

Change-Id: I18ff2a20dd353523688a617f9f18157260adffb5
2022-01-20 22:06:58 +00:00
Usta Shrestha
ac11e1290f Blueprint to support multiline (Go style raw) strings am: 53bc344a81 am: 2f2ec92037 am: 12dbce42c3
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1953722

Change-Id: I27043247f32b0a7e01106afb09ab3fd8507775af
2022-01-20 21:54:34 +00:00
Usta Shrestha
12dbce42c3 Blueprint to support multiline (Go style raw) strings am: 53bc344a81 am: 2f2ec92037
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1953722

Change-Id: I678aaa6a2684f94161f3e61bb4e3d1e39d321dcc
2022-01-20 21:37:39 +00:00
Usta Shrestha
2f2ec92037 Blueprint to support multiline (Go style raw) strings am: 53bc344a81
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1953722

Change-Id: Ic18586a2d5e82328d844ea443ccb5521d30132a3
2022-01-20 21:08:00 +00:00
Usta Shrestha
53bc344a81 Blueprint to support multiline (Go style raw) strings
Bug: 206961391
Test: m nothing and diff the ninja files
Change-Id: I9a7ffafe6a3992bf05180a032f4b277cbecb7dc6
2022-01-19 22:58:01 +00:00
Usta Shrestha
4e405ddaa3 use iota for "enum" am: 62823dcf01 am: 2cacef74be am: 265745d7e0 am: 7e6d27f79d
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1953567

Change-Id: Ibe111e308675f4714f524b8c0cba91cda5663917
2022-01-19 02:07:04 +00:00
Usta Shrestha
7e6d27f79d use iota for "enum" am: 62823dcf01 am: 2cacef74be am: 265745d7e0
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1953567

Change-Id: Ia77f94ecaeb919afddec53fdd4af02af8238f1bd
2022-01-19 01:48:08 +00:00
Usta Shrestha
265745d7e0 use iota for "enum" am: 62823dcf01 am: 2cacef74be
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1953567

Change-Id: I227b55f84ff796e5303ff04e949026dfa60a982c
2022-01-19 01:31:41 +00:00
Usta Shrestha
2cacef74be use iota for "enum" am: 62823dcf01
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1953567

Change-Id: Ibef4900bcc72a4a19b9b0d44fca4af851d3caafa
2022-01-19 01:13:36 +00:00
Usta Shrestha
ba242ec7ae Typos and missing parameter names use in doc comment am: ee7a5d7a16 am: 25c221eb36 am: 234f303482 am: 3092a02b9f
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1953566

Change-Id: Id9a169b7ebdc6798dee2443150171811ec004f68
2022-01-19 00:27:54 +00:00
Usta Shrestha
3092a02b9f Typos and missing parameter names use in doc comment am: ee7a5d7a16 am: 25c221eb36 am: 234f303482
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1953566

Change-Id: I0f619b0467bd5db32e1ea1b9c71b41e86904781b
2022-01-19 00:09:25 +00:00
Usta Shrestha
234f303482 Typos and missing parameter names use in doc comment am: ee7a5d7a16 am: 25c221eb36
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1953566

Change-Id: Ida9ae56572e49b8e059b15aa4a1ac222a855b155
2022-01-18 23:52:40 +00:00
Usta Shrestha
25c221eb36 Typos and missing parameter names use in doc comment am: ee7a5d7a16
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1953566

Change-Id: I9758390452c035df9ceebbf75ec2cf254a68d278
2022-01-18 23:34:35 +00:00
Usta Shrestha
62823dcf01 use iota for "enum"
Test: m nothing
Bug: N/A
Change-Id: I9d59796cbf1dc3dc8e1e9fc536b50c1dea3a5f61
2022-01-18 16:51:12 -05:00
Usta Shrestha
ee7a5d7a16 Typos and missing parameter names use in doc comment
Test: N/A
Bug: N/A
Change-Id: I01331365925decef22502da02a23ed4ce610da98
2022-01-18 16:46:30 -05:00
Liz Kammer
6bce106fd8 Merge "Add proptools helper functions." am: c643dd96cd am: 50484248d4 am: 974ef396f3 am: f6962bb758
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1944344

Change-Id: I268fef925dcb02963520c907317e1c67453bdd43
2022-01-12 14:18:24 +00:00
Liz Kammer
f6962bb758 Merge "Add proptools helper functions." am: c643dd96cd am: 50484248d4 am: 974ef396f3
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1944344

Change-Id: I118befba9a73b1feac1f5c592120c8c981b8a41e
2022-01-12 14:05:44 +00:00
Liz Kammer
974ef396f3 Merge "Add proptools helper functions." am: c643dd96cd am: 50484248d4
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1944344

Change-Id: I5d36cf706813440ef9f6ed99c04ee505f93fa328
2022-01-12 13:54:30 +00:00
Liz Kammer
50484248d4 Merge "Add proptools helper functions." am: c643dd96cd
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1944344

Change-Id: I4a2c91445378bef8d85df99330c9dba963258275
2022-01-12 13:42:27 +00:00
Liz Kammer
c643dd96cd Merge "Add proptools helper functions." 2022-01-12 13:23:33 +00:00
Liz Kammer
5319d07308 Add proptools helper functions.
Test: existing blueprint tests
Change-Id: Ie32bc2a0d075b1b7cc9fe1247d1f02dc1af67449
2022-01-11 10:21:05 -05:00
kgui
38944de689 Add JSON data related struct and function into context. am: 20f19a5d9b am: d7fda94073 am: 5d6e46e687 am: 1ef2a6ecfe
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1942213

Change-Id: Idc8a03d72f8655315bf5bdf43f667e3023f907dd
2022-01-11 05:00:48 +00:00
kgui
1ef2a6ecfe Add JSON data related struct and function into context. am: 20f19a5d9b am: d7fda94073 am: 5d6e46e687
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1942213

Change-Id: I41c304f46ce6be200bcdb69bf7a696f1978c057b
2022-01-11 04:37:36 +00:00
kgui
5d6e46e687 Add JSON data related struct and function into context. am: 20f19a5d9b am: d7fda94073
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1942213

Change-Id: Ic84d2c4c1c6c40aba8d1342f36694e9063c88bec
2022-01-11 04:14:23 +00:00
kgui
d7fda94073 Add JSON data related struct and function into context. am: 20f19a5d9b
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1942213

Change-Id: I823dfb5bb38234512ed96831dfaf1e7fff91e4e8
2022-01-11 03:43:05 +00:00
kgui
20f19a5d9b Add JSON data related struct and function into context.
Test: local test
Change-Id: I7a2000b458378f240cd6481066c15dec98d110ea
2022-01-10 14:55:06 +08:00
Treehugger Robot
fcd8308c5a Merge "Reset contexts before calling LoadHook" am: 33132a4fd5 am: 360359e166 am: 7cbcb11dc5 am: b4d64a468d
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1934953

Change-Id: I6a934cc2df0789c92fccbb10dbc4e7d639174269
2022-01-06 02:27:16 +00:00
Treehugger Robot
b4d64a468d Merge "Reset contexts before calling LoadHook" am: 33132a4fd5 am: 360359e166 am: 7cbcb11dc5
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1934953

Change-Id: I1f394d07d665e78c95b371eac6bfc8d44fd27883
2022-01-06 02:14:43 +00:00
Treehugger Robot
7cbcb11dc5 Merge "Reset contexts before calling LoadHook" am: 33132a4fd5 am: 360359e166
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1934953

Change-Id: I3f89635e37a8efa76e33d411d6af1944f14b9e87
2022-01-06 01:57:53 +00:00
Treehugger Robot
360359e166 Merge "Reset contexts before calling LoadHook" am: 33132a4fd5
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1934953

Change-Id: I9821009ea7f975b80b97afd43c940b44cac810fe
2022-01-06 01:46:55 +00:00
Treehugger Robot
33132a4fd5 Merge "Reset contexts before calling LoadHook" 2022-01-06 01:31:00 +00:00
Lukacs T. Berki
9cc9fa9aa3 Allow soong_ui to set env vars for soong_build . am: a67610a75f am: d4493bb3be am: 80982062b5 am: b4a5e16e5a
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1934981

Change-Id: I4073fbffc059226b1cc19eb0a9c2344b15fb1ac3
2022-01-05 13:32:03 +00:00
Lukacs T. Berki
b4a5e16e5a Allow soong_ui to set env vars for soong_build . am: a67610a75f am: d4493bb3be am: 80982062b5
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1934981

Change-Id: I03218e2ccf9e7046d6ec6371cc37fac05f59ff07
2022-01-05 13:17:37 +00:00
Lukacs T. Berki
80982062b5 Allow soong_ui to set env vars for soong_build . am: a67610a75f am: d4493bb3be
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1934981

Change-Id: Icb900111a23f7359a0a88f5d8e0c454053980184
2022-01-05 13:01:09 +00:00
Lukacs T. Berki
d4493bb3be Allow soong_ui to set env vars for soong_build . am: a67610a75f
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1934981

Change-Id: I13b0535c9a2091ab8badc89c6981c46992aa5c20
2022-01-05 12:48:55 +00:00
Inseob Kim
1e01a4e7c2 Reset contexts before calling LoadHook
If more than one loadhooks exist, calls to CreateModule will make an
error because the contexts object isn't reset and the same modules are
added more than once. This fixes the bug by initializing contexts object
every time.

Bug: 213297238
Test: manual
Change-Id: I545c1592c3217b764968a8937c962e9d58a85291
2022-01-05 19:56:08 +09:00
Lukács T. Berki
cf4521dcce Merge "Set GODEBUG=asyncpreemptoff=1 for soong_build." am: 1a1ec4b59c am: 076697475f am: 517b1e44c4 am: e931042a30
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1933149

Change-Id: Ie0bbcb7a560e63cf20e150cd31377f4ce73c0f3f
2022-01-05 10:07:03 +00:00
Lukács T. Berki
e931042a30 Merge "Set GODEBUG=asyncpreemptoff=1 for soong_build." am: 1a1ec4b59c am: 076697475f am: 517b1e44c4
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1933149

Change-Id: Ic0ebcbdae448d60aa286731b4c3222894b9a1210
2022-01-05 09:53:37 +00:00
Lukács T. Berki
517b1e44c4 Merge "Set GODEBUG=asyncpreemptoff=1 for soong_build." am: 1a1ec4b59c am: 076697475f
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1933149

Change-Id: Ic16caf68fb70f711c1dff2568dea575a30eda6e3
2022-01-05 09:33:48 +00:00