Commit graph

2545 commits

Author SHA1 Message Date
Jooyung Han
94474d68bb bpmodify: -add-literal to add a value to the list am: 451dd63611 am: 34f9c28f0f
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1977927

Change-Id: Ief368d04be77b6828338fcbb68d1bfc75bd1659d
2022-02-11 00:30:19 +00:00
Jooyung Han
2f36907173 Add newlines around list of structs am: 0cb1064428 am: d5be0c1c66
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1977926

Change-Id: Ie4446d7d00956070d9c1b3493a1362c48a5f3709
2022-02-11 00:30:18 +00:00
Jooyung Han
34f9c28f0f bpmodify: -add-literal to add a value to the list am: 451dd63611
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1977927

Change-Id: Idcb5633d38c7367e1b8a3bc4cfddebda43f0520a
2022-02-11 00:13:09 +00:00
Jooyung Han
d5be0c1c66 Add newlines around list of structs am: 0cb1064428
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1977926

Change-Id: I293133c1e09aa79807b3554c9a334e900830a985
2022-02-11 00:13:08 +00:00
Jooyung Han
451dd63611 bpmodify: -add-literal to add a value to the list
-a works with only string values. When we need to add numbers, booleans,
or even structs, -add-literal can be used now.

  bpmodify -m foo -property list-of-ints -add-literal 123
  bpmodify -m foo -property list-of-structs \
    -add-literal "{key: \"value\"}"

Bug: 146436251
Test: go test ./bpmodify
Change-Id: I91d23d7bf89491643aa595f5ebccd9410a9cbb09
2022-02-09 11:16:02 +09:00
Jooyung Han
0cb1064428 Add newlines around list of structs
Since a struct(parser.Map) occupies multiple lines, adding newlines
around brackets([]) looks better even the list has only a single value.

  prop: [ {
    name: "foo",
  }],

vs

  prop: [
    {
      name: "foo",
    },
  ],

Bug: n/a
Test: go test ./parser
Change-Id: I1a574aa038a26235848b6c9b5b4f01a0ab2c8c00
2022-02-09 11:10:12 +09:00
Liz Kammer
2587e3605f Add a limit to blueprint filesystem accesses am: 2df87f3cd9 am: f3a1b1a85a am: cb62acd070 am: 4e2bd9af84
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1975786

Change-Id: Ie46c1c9376efd14b7c3899577088a9af498f2776
2022-02-08 23:40:31 +00:00
Liz Kammer
4e2bd9af84 Add a limit to blueprint filesystem accesses am: 2df87f3cd9 am: f3a1b1a85a am: cb62acd070
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1975786

Change-Id: I33b85af0ea9592146658c33267d2c04d3a60b7a6
2022-02-08 23:23:19 +00:00
Liz Kammer
cb62acd070 Add a limit to blueprint filesystem accesses am: 2df87f3cd9 am: f3a1b1a85a
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1975786

Change-Id: Iec28e9ac4924bd0b021e7dff513a977dc41d188b
2022-02-08 23:06:43 +00:00
Liz Kammer
f3a1b1a85a Add a limit to blueprint filesystem accesses am: 2df87f3cd9
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1975786

Change-Id: Iac0f5009454c8f19f8a94bac501d041793ab8d46
2022-02-08 22:47:59 +00:00
Liz Kammer
2df87f3cd9 Add a limit to blueprint filesystem accesses
Mac builds keep running into too many files open. Restrict access of
filesystem to the current limit.

Test: m nothing
Change-Id: I2365da7c641f7c7f5d948396c6862eb3a0d1d8b9
2022-02-08 15:16:59 -05:00
Treehugger Robot
10bfba3f5a Merge "Rename saneSplit --> quickSplit" am: fc56ef6e20 am: bbd604b48a am: 3b3738c58a am: eeeac5ffc1
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1974127

Change-Id: I040658cb6dab453922d4ac75f95b49c2ae354464
2022-02-07 22:32:00 +00:00
Treehugger Robot
eeeac5ffc1 Merge "Rename saneSplit --> quickSplit" am: fc56ef6e20 am: bbd604b48a am: 3b3738c58a
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1974127

Change-Id: I8582aa8058556421cf5689738e2f2f3e41203018
2022-02-07 22:19:56 +00:00
Treehugger Robot
3b3738c58a Merge "Rename saneSplit --> quickSplit" am: fc56ef6e20 am: bbd604b48a
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1974127

Change-Id: Id0132f75fd965cf006863439f5dbfa92b2ff922a
2022-02-07 22:08:32 +00:00
Treehugger Robot
bbd604b48a Merge "Rename saneSplit --> quickSplit" am: fc56ef6e20
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1974127

Change-Id: I87bacf9d3a7b92ada403a166d3b7e0c914555f92
2022-02-07 21:49:43 +00:00
Treehugger Robot
fc56ef6e20 Merge "Rename saneSplit --> quickSplit" 2022-02-07 21:25:07 +00:00
Liz Kammer
9c21790378 Close file after reading am: 6e7e6a92c7 am: 1766f42947 am: 049aff5037 am: e2fa5d1288
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1972903

Change-Id: I37ca16cf0f9f6d228e61442876c0b5f5a9c49a78
2022-02-07 19:37:55 +00:00
Liz Kammer
e2fa5d1288 Close file after reading am: 6e7e6a92c7 am: 1766f42947 am: 049aff5037
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1972903

Change-Id: I51d846671782cf16c0bf6a08cb9b8defd600a250
2022-02-07 19:23:33 +00:00
Liz Kammer
049aff5037 Close file after reading am: 6e7e6a92c7 am: 1766f42947
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1972903

Change-Id: I13d7dfd6a95fd969e275cf0fed89742e28efb608
2022-02-07 19:14:25 +00:00
Liz Kammer
1766f42947 Close file after reading am: 6e7e6a92c7
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1972903

Change-Id: I4b7b5e4d4fa5c36ced93d328b254856a3a6896f9
2022-02-07 19:02:40 +00:00
Liz Kammer
6e7e6a92c7 Close file after reading
Test: m nothing
Change-Id: Ib2daa2081d47c52bd3994520d522c5df95973e4a
2022-02-07 10:04:51 -05:00
Liz Kammer
8b162be674 Rename saneSplit --> quickSplit
This better describes its goal and is more inclusive.

Test: go test blueprint pathtools tests
Change-Id: Ia382f1fe65d0b551dc5d92d40ddf3cb356f3204d
2022-02-07 09:41:01 -05:00
Usta Shrestha
6b2f45b604 gitignore intelliJ files am: 1b438d6b7e am: 545da71ca8 am: 17df6eb302 am: ad832dd261
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1968839

Change-Id: I4f232d63ce416687b36bfc135ebdbc658698b79d
2022-02-02 20:34:47 +00:00
Usta Shrestha
ad832dd261 gitignore intelliJ files am: 1b438d6b7e am: 545da71ca8 am: 17df6eb302
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1968839

Change-Id: I6929df1afc7cd12dae82fe5f1bfd9c5624a2d3e4
2022-02-02 20:22:27 +00:00
Usta Shrestha
17df6eb302 gitignore intelliJ files am: 1b438d6b7e am: 545da71ca8
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1968839

Change-Id: I40a3d33d546cd880d22cc6aab684fc7ccce9ae90
2022-02-02 20:09:57 +00:00
Usta Shrestha
545da71ca8 gitignore intelliJ files am: 1b438d6b7e
Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/1968839

Change-Id: I6fb5fda0ba7e01c049da9b430791db20a4dc9663
2022-02-02 19:55:56 +00:00
Usta Shrestha
1b438d6b7e gitignore intelliJ files
Bug: N/A
Test: N/A
Change-Id: Iff9eabb3915bff566ee62deb339f0cbe89b5c6ef
2022-02-02 11:36:11 -05:00
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