Skip to content

Commit fdd7672

Browse files
dcharkesdcharkes
authored
[native_assets_cli] Cleanup JSON: old asset encoding (#2220)
1 parent 4e1ef75 commit fdd7672

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+188
-713
lines changed

‎pkgs/code_assets/doc/schema/shared/shared_definitions.schema.json

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,6 @@
4040
{
4141
"const": "code_assets/code"
4242
},
43-
{
44-
"const": "native_code"
45-
},
4643
{
4744
"type": "string"
4845
}
@@ -65,28 +62,6 @@
6562
}
6663
}
6764
}
68-
},
69-
{
70-
"if": {
71-
"properties": {
72-
"type": {
73-
"const": "native_code"
74-
}
75-
}
76-
},
77-
"then": {
78-
"properties": {
79-
"encoding": {
80-
"$ref": "#/definitions/NativeCodeAssetEncoding"
81-
}
82-
},
83-
"allOf": [
84-
{
85-
"$comment": "Also include the fields parent object for backwards compatibility.",
86-
"$ref": "#/definitions/NativeCodeAssetEncoding"
87-
}
88-
]
89-
}
9065
}
9166
]
9267
},

‎pkgs/code_assets/test/data/build_input_android.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"$schema": "../../doc/schema/sdk/build_input.generated.schema.json",
33
"config": {
44
"build_asset_types": [
5-
"native_code"
5+
"code_assets/code"
66
],
77
"code": {
88
"android": {

‎pkgs/code_assets/test/data/build_input_ios.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"$schema": "../../doc/schema/sdk/build_input.generated.schema.json",
33
"config": {
44
"build_asset_types": [
5-
"native_code"
5+
"code_assets/code"
66
],
77
"code": {
88
"c_compiler": {

‎pkgs/code_assets/test/data/build_input_linux.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"$schema": "../../doc/schema/sdk/build_input.generated.schema.json",
33
"config": {
44
"build_asset_types": [
5-
"native_code"
5+
"code_assets/code"
66
],
77
"code": {
88
"c_compiler": {

‎pkgs/code_assets/test/data/build_input_macos.json

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,13 @@
1010
"type": "static"
1111
}
1212
},
13-
"file": "/private/var/folders/2y/mngq9h194yzglt4kzttzfq6800klzg/T/iv6i0d/native_add/.dart_tool/native_assets_builder/native_add/c6b312c90c95d2d98ffb6760a738fb36/out/libnative_add.a",
14-
"id": "package:native_add/src/native_add_bindings_generated.dart",
15-
"link_mode": {
16-
"type": "static"
17-
},
18-
"type": "native_code"
13+
"type": "code_assets/code"
1914
}
2015
]
2116
},
2217
"config": {
2318
"build_asset_types": [
24-
"native_code"
19+
"code_assets/code"
2520
],
2621
"code": {
2722
"c_compiler": {

‎pkgs/code_assets/test/data/build_input_windows.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"$schema": "../../doc/schema/sdk/build_input.generated.schema.json",
33
"config": {
44
"build_asset_types": [
5-
"native_code"
5+
"code_assets/code"
66
],
77
"code": {
88
"c_compiler": {

‎pkgs/code_assets/test/data/build_output_android.json

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,7 @@
99
"type": "dynamic_loading_bundle"
1010
}
1111
},
12-
"file": "/Users/dacoharkes/src/dacoharkes/playground/my_package/example/.dart_tool/native_assets_builder/my_package/c540d75d10834674921701cd6c3c7c15/out/libmy_package.so",
13-
"id": "package:my_package/my_package_bindings_generated.dart",
14-
"link_mode": {
15-
"type": "dynamic_loading_bundle"
16-
},
17-
"type": "native_code"
12+
"type": "code_assets/code"
1813
}
1914
],
2015
"dependencies": [

‎pkgs/code_assets/test/data/build_output_linux.json

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,7 @@
99
"type": "dynamic_loading_bundle"
1010
}
1111
},
12-
"file": "/usr/local/google/home/dacoharkes/src/dacoharkes/playground/my_package/example/.dart_tool/native_assets_builder/my_package/79cc7fbaec53b1465c3e388e6848234b/out/libmy_package.so",
13-
"id": "package:my_package/my_package_bindings_generated.dart",
14-
"link_mode": {
15-
"type": "dynamic_loading_bundle"
16-
},
17-
"type": "native_code"
12+
"type": "code_assets/code"
1813
}
1914
],
2015
"dependencies": [

‎pkgs/code_assets/test/data/build_output_macos.json

Lines changed: 8 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,7 @@
99
"type": "dynamic_loading_bundle"
1010
}
1111
},
12-
"file": "/private/var/folders/2y/mngq9h194yzglt4kzttzfq6800klzg/T/ZnD2I3/native_add/.dart_tool/native_assets_builder/native_add/14857adfaff1b1829b79c612288f54d7/out/libnative_add.dylib",
13-
"id": "package:native_add/src/native_add_bindings_generated.dart",
14-
"link_mode": {
15-
"type": "dynamic_loading_bundle"
16-
},
17-
"type": "native_code"
12+
"type": "code_assets/code"
1813
},
1914
{
2015
"encoding": {
@@ -24,12 +19,7 @@
2419
"type": "static"
2520
}
2621
},
27-
"file": "/private/var/folders/2y/mngq9h194yzglt4kzttzfq6800klzg/T/iv6i0d/native_add/.dart_tool/native_assets_builder/native_add/c6b312c90c95d2d98ffb6760a738fb36/out/libnative_add.a",
28-
"id": "package:native_add/src/native_add_bindings_generated.dart",
29-
"link_mode": {
30-
"type": "static"
31-
},
32-
"type": "native_code"
22+
"type": "code_assets/code"
3323
},
3424
{
3525
"encoding": {
@@ -38,11 +28,7 @@
3828
"type": "dynamic_loading_executable"
3929
}
4030
},
41-
"id": "package:system_library/memory_executable.dart",
42-
"link_mode": {
43-
"type": "dynamic_loading_executable"
44-
},
45-
"type": "native_code"
31+
"type": "code_assets/code"
4632
},
4733
{
4834
"encoding": {
@@ -51,11 +37,7 @@
5137
"type": "dynamic_loading_process"
5238
}
5339
},
54-
"id": "package:system_library/memory_process.dart",
55-
"link_mode": {
56-
"type": "dynamic_loading_process"
57-
},
58-
"type": "native_code"
40+
"type": "code_assets/code"
5941
},
6042
{
6143
"encoding": {
@@ -65,12 +47,7 @@
6547
"uri": "libc.dylib"
6648
}
6749
},
68-
"id": "package:system_library/memory_system.dart",
69-
"link_mode": {
70-
"type": "dynamic_loading_system",
71-
"uri": "libc.dylib"
72-
},
73-
"type": "native_code"
50+
"type": "code_assets/code"
7451
}
7552
],
7653
"assetsForLinking": {
@@ -83,12 +60,7 @@
8360
"type": "static"
8461
}
8562
},
86-
"file": "/private/var/folders/2y/mngq9h194yzglt4kzttzfq6800klzg/T/iv6i0d/native_add/.dart_tool/native_assets_builder/native_add/c6b312c90c95d2d98ffb6760a738fb36/out/libnative_add.a",
87-
"id": "package:native_add/src/native_add_bindings_generated.dart",
88-
"link_mode": {
89-
"type": "static"
90-
},
91-
"type": "native_code"
63+
"type": "code_assets/code"
9264
}
9365
]
9466
},
@@ -101,12 +73,7 @@
10173
"type": "static"
10274
}
10375
},
104-
"file": "/private/var/folders/2y/mngq9h194yzglt4kzttzfq6800klzg/T/iv6i0d/native_add/.dart_tool/native_assets_builder/native_add/c6b312c90c95d2d98ffb6760a738fb36/out/libnative_add.a",
105-
"id": "package:native_add/src/native_add_bindings_generated.dart",
106-
"link_mode": {
107-
"type": "static"
108-
},
109-
"type": "native_code"
76+
"type": "code_assets/code"
11077
}
11178
],
11279
"assets_for_linking": {
@@ -119,12 +86,7 @@
11986
"type": "static"
12087
}
12188
},
122-
"file": "/private/var/folders/2y/mngq9h194yzglt4kzttzfq6800klzg/T/iv6i0d/native_add/.dart_tool/native_assets_builder/native_add/c6b312c90c95d2d98ffb6760a738fb36/out/libnative_add.a",
123-
"id": "package:native_add/src/native_add_bindings_generated.dart",
124-
"link_mode": {
125-
"type": "static"
126-
},
127-
"type": "native_code"
89+
"type": "code_assets/code"
12890
}
12991
]
13092
},

‎pkgs/code_assets/test/data/build_output_windows.json

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,7 @@
99
"type": "dynamic_loading_bundle"
1010
}
1111
},
12-
"file": "C:\\src\\dacoharkes\\playground\\my_package\\example\\.dart_tool\\native_assets_builder\\my_package\\190c04c47dc2f9eb26d2411b1968b2cf\\out\\my_package.dll",
13-
"id": "package:my_package/my_package_bindings_generated.dart",
14-
"link_mode": {
15-
"type": "dynamic_loading_bundle"
16-
},
17-
"type": "native_code"
12+
"type": "code_assets/code"
1813
}
1914
],
2015
"dependencies": [

‎pkgs/code_assets/test/data/link_input_macos.json

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,7 @@
99
"type": "static"
1010
}
1111
},
12-
"file": "/private/var/folders/2y/mngq9h194yzglt4kzttzfq6800klzg/T/iv6i0d/native_add/.dart_tool/native_assets_builder/native_add/c6b312c90c95d2d98ffb6760a738fb36/out/libnative_add.a",
13-
"id": "package:native_add/src/native_add_bindings_generated.dart",
14-
"link_mode": {
15-
"type": "static"
16-
},
17-
"type": "native_code"
12+
"type": "code_assets/code"
1813
},
1914
{
2015
"encoding": {
@@ -29,7 +24,7 @@
2924
],
3025
"config": {
3126
"build_asset_types": [
32-
"native_code"
27+
"code_assets/code"
3328
],
3429
"code": {
3530
"c_compiler": {

‎pkgs/code_assets/test/data/link_output_macos.json

Lines changed: 5 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,7 @@
99
"type": "dynamic_loading_bundle"
1010
}
1111
},
12-
"file": "/private/var/folders/2y/mngq9h194yzglt4kzttzfq6800klzg/T/ZnD2I3/native_add/.dart_tool/native_assets_builder/native_add/14857adfaff1b1829b79c612288f54d7/out/libnative_add.dylib",
13-
"id": "package:native_add/src/native_add_bindings_generated.dart",
14-
"link_mode": {
15-
"type": "dynamic_loading_bundle"
16-
},
17-
"type": "native_code"
12+
"type": "code_assets/code"
1813
},
1914
{
2015
"encoding": {
@@ -24,12 +19,7 @@
2419
"type": "static"
2520
}
2621
},
27-
"file": "/private/var/folders/2y/mngq9h194yzglt4kzttzfq6800klzg/T/iv6i0d/native_add/.dart_tool/native_assets_builder/native_add/c6b312c90c95d2d98ffb6760a738fb36/out/libnative_add.a",
28-
"id": "package:native_add/src/native_add_bindings_generated.dart",
29-
"link_mode": {
30-
"type": "static"
31-
},
32-
"type": "native_code"
22+
"type": "code_assets/code"
3323
},
3424
{
3525
"encoding": {
@@ -38,11 +28,7 @@
3828
"type": "dynamic_loading_executable"
3929
}
4030
},
41-
"id": "package:system_library/memory_executable.dart",
42-
"link_mode": {
43-
"type": "dynamic_loading_executable"
44-
},
45-
"type": "native_code"
31+
"type": "code_assets/code"
4632
},
4733
{
4834
"encoding": {
@@ -51,11 +37,7 @@
5137
"type": "dynamic_loading_process"
5238
}
5339
},
54-
"id": "package:system_library/memory_process.dart",
55-
"link_mode": {
56-
"type": "dynamic_loading_process"
57-
},
58-
"type": "native_code"
40+
"type": "code_assets/code"
5941
},
6042
{
6143
"encoding": {
@@ -65,12 +47,7 @@
6547
"uri": "libc.dylib"
6648
}
6749
},
68-
"id": "package:system_library/memory_system.dart",
69-
"link_mode": {
70-
"type": "dynamic_loading_system",
71-
"uri": "libc.dylib"
72-
},
73-
"type": "native_code"
50+
"type": "code_assets/code"
7451
}
7552
],
7653
"dependencies": [

0 commit comments

Comments
 (0)