Skip to content

Commit 4e1ef75

Browse files
dcharkesdcharkes
authored
[native_assets_cli] Cleanup JSON: Code Asset OS and Architecture (#2219)
Bug: * #2199 Cleanup from: * #2127
1 parent 3add31b commit 4e1ef75

File tree

78 files changed

+110
-489
lines changed

Some content is hidden

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

78 files changed

+110
-489
lines changed

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

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -342,13 +342,6 @@
342342
"NativeCodeAssetEncoding": {
343343
"type": "object",
344344
"properties": {
345-
"architecture": {
346-
"allOf": [
347-
{
348-
"$ref": "#/definitions/Architecture"
349-
}
350-
]
351-
},
352345
"file": {
353346
"$ref": "../../../../hooks/doc/schema/shared/shared_definitions.schema.json#/definitions/absolutePath"
354347
},
@@ -357,9 +350,6 @@
357350
},
358351
"link_mode": {
359352
"$ref": "#/definitions/LinkMode"
360-
},
361-
"os": {
362-
"$ref": "#/definitions/OS"
363353
}
364354
},
365355
"required": [

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

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,18 @@
33
"assets": {
44
"some_package": [
55
{
6-
"architecture": "arm64",
76
"encoding": {
8-
"architecture": "arm64",
97
"file": "/private/var/folders/2y/mngq9h194yzglt4kzttzfq6800klzg/T/iv6i0d/native_add/.dart_tool/native_assets_builder/native_add/c6b312c90c95d2d98ffb6760a738fb36/out/libnative_add.a",
108
"id": "package:native_add/src/native_add_bindings_generated.dart",
119
"link_mode": {
1210
"type": "static"
13-
},
14-
"os": "macos"
11+
}
1512
},
1613
"file": "/private/var/folders/2y/mngq9h194yzglt4kzttzfq6800klzg/T/iv6i0d/native_add/.dart_tool/native_assets_builder/native_add/c6b312c90c95d2d98ffb6760a738fb36/out/libnative_add.a",
1714
"id": "package:native_add/src/native_add_bindings_generated.dart",
1815
"link_mode": {
1916
"type": "static"
2017
},
21-
"os": "macos",
2218
"type": "native_code"
2319
}
2420
]

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

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,18 @@
22
"$schema": "../../doc/schema/hook/build_output.generated.schema.json",
33
"assets": [
44
{
5-
"architecture": "arm",
65
"encoding": {
7-
"architecture": "arm",
86
"file": "/Users/dacoharkes/src/dacoharkes/playground/my_package/example/.dart_tool/native_assets_builder/my_package/c540d75d10834674921701cd6c3c7c15/out/libmy_package.so",
97
"id": "package:my_package/my_package_bindings_generated.dart",
108
"link_mode": {
119
"type": "dynamic_loading_bundle"
12-
},
13-
"os": "android"
10+
}
1411
},
1512
"file": "/Users/dacoharkes/src/dacoharkes/playground/my_package/example/.dart_tool/native_assets_builder/my_package/c540d75d10834674921701cd6c3c7c15/out/libmy_package.so",
1613
"id": "package:my_package/my_package_bindings_generated.dart",
1714
"link_mode": {
1815
"type": "dynamic_loading_bundle"
1916
},
20-
"os": "android",
2117
"type": "native_code"
2218
}
2319
],

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

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,18 @@
22
"$schema": "../../doc/schema/hook/build_output.generated.schema.json",
33
"assets": [
44
{
5-
"architecture": "x64",
65
"encoding": {
7-
"architecture": "x64",
86
"file": "/usr/local/google/home/dacoharkes/src/dacoharkes/playground/my_package/example/.dart_tool/native_assets_builder/my_package/79cc7fbaec53b1465c3e388e6848234b/out/libmy_package.so",
97
"id": "package:my_package/my_package_bindings_generated.dart",
108
"link_mode": {
119
"type": "dynamic_loading_bundle"
12-
},
13-
"os": "linux"
10+
}
1411
},
1512
"file": "/usr/local/google/home/dacoharkes/src/dacoharkes/playground/my_package/example/.dart_tool/native_assets_builder/my_package/79cc7fbaec53b1465c3e388e6848234b/out/libmy_package.so",
1613
"id": "package:my_package/my_package_bindings_generated.dart",
1714
"link_mode": {
1815
"type": "dynamic_loading_bundle"
1916
},
20-
"os": "linux",
2117
"type": "native_code"
2218
}
2319
],

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

Lines changed: 8 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -2,160 +2,128 @@
22
"$schema": "../../doc/schema/hook/build_output.generated.schema.json",
33
"assets": [
44
{
5-
"architecture": "arm64",
65
"encoding": {
7-
"architecture": "arm64",
86
"file": "/private/var/folders/2y/mngq9h194yzglt4kzttzfq6800klzg/T/ZnD2I3/native_add/.dart_tool/native_assets_builder/native_add/14857adfaff1b1829b79c612288f54d7/out/libnative_add.dylib",
97
"id": "package:native_add/src/native_add_bindings_generated.dart",
108
"link_mode": {
119
"type": "dynamic_loading_bundle"
12-
},
13-
"os": "macos"
10+
}
1411
},
1512
"file": "/private/var/folders/2y/mngq9h194yzglt4kzttzfq6800klzg/T/ZnD2I3/native_add/.dart_tool/native_assets_builder/native_add/14857adfaff1b1829b79c612288f54d7/out/libnative_add.dylib",
1613
"id": "package:native_add/src/native_add_bindings_generated.dart",
1714
"link_mode": {
1815
"type": "dynamic_loading_bundle"
1916
},
20-
"os": "macos",
2117
"type": "native_code"
2218
},
2319
{
24-
"architecture": "arm64",
2520
"encoding": {
26-
"architecture": "arm64",
2721
"file": "/private/var/folders/2y/mngq9h194yzglt4kzttzfq6800klzg/T/iv6i0d/native_add/.dart_tool/native_assets_builder/native_add/c6b312c90c95d2d98ffb6760a738fb36/out/libnative_add.a",
2822
"id": "package:native_add/src/native_add_bindings_generated.dart",
2923
"link_mode": {
3024
"type": "static"
31-
},
32-
"os": "macos"
25+
}
3326
},
3427
"file": "/private/var/folders/2y/mngq9h194yzglt4kzttzfq6800klzg/T/iv6i0d/native_add/.dart_tool/native_assets_builder/native_add/c6b312c90c95d2d98ffb6760a738fb36/out/libnative_add.a",
3528
"id": "package:native_add/src/native_add_bindings_generated.dart",
3629
"link_mode": {
3730
"type": "static"
3831
},
39-
"os": "macos",
4032
"type": "native_code"
4133
},
4234
{
43-
"architecture": "arm64",
4435
"encoding": {
45-
"architecture": "arm64",
4636
"id": "package:system_library/memory_executable.dart",
4737
"link_mode": {
4838
"type": "dynamic_loading_executable"
49-
},
50-
"os": "macos"
39+
}
5140
},
5241
"id": "package:system_library/memory_executable.dart",
5342
"link_mode": {
5443
"type": "dynamic_loading_executable"
5544
},
56-
"os": "macos",
5745
"type": "native_code"
5846
},
5947
{
60-
"architecture": "arm64",
6148
"encoding": {
62-
"architecture": "arm64",
6349
"id": "package:system_library/memory_process.dart",
6450
"link_mode": {
6551
"type": "dynamic_loading_process"
66-
},
67-
"os": "macos"
52+
}
6853
},
6954
"id": "package:system_library/memory_process.dart",
7055
"link_mode": {
7156
"type": "dynamic_loading_process"
7257
},
73-
"os": "macos",
7458
"type": "native_code"
7559
},
7660
{
77-
"architecture": "arm64",
7861
"encoding": {
79-
"architecture": "arm64",
8062
"id": "package:system_library/memory_system.dart",
8163
"link_mode": {
8264
"type": "dynamic_loading_system",
8365
"uri": "libc.dylib"
84-
},
85-
"os": "macos"
66+
}
8667
},
8768
"id": "package:system_library/memory_system.dart",
8869
"link_mode": {
8970
"type": "dynamic_loading_system",
9071
"uri": "libc.dylib"
9172
},
92-
"os": "macos",
9373
"type": "native_code"
9474
}
9575
],
9676
"assetsForLinking": {
9777
"package_with_linker": [
9878
{
99-
"architecture": "arm64",
10079
"encoding": {
101-
"architecture": "arm64",
10280
"file": "/private/var/folders/2y/mngq9h194yzglt4kzttzfq6800klzg/T/iv6i0d/native_add/.dart_tool/native_assets_builder/native_add/c6b312c90c95d2d98ffb6760a738fb36/out/libnative_add.a",
10381
"id": "package:native_add/src/native_add_bindings_generated.dart",
10482
"link_mode": {
10583
"type": "static"
106-
},
107-
"os": "macos"
84+
}
10885
},
10986
"file": "/private/var/folders/2y/mngq9h194yzglt4kzttzfq6800klzg/T/iv6i0d/native_add/.dart_tool/native_assets_builder/native_add/c6b312c90c95d2d98ffb6760a738fb36/out/libnative_add.a",
11087
"id": "package:native_add/src/native_add_bindings_generated.dart",
11188
"link_mode": {
11289
"type": "static"
11390
},
114-
"os": "macos",
11591
"type": "native_code"
11692
}
11793
]
11894
},
11995
"assets_for_build": [
12096
{
121-
"architecture": "arm64",
12297
"encoding": {
123-
"architecture": "arm64",
12498
"file": "/private/var/folders/2y/mngq9h194yzglt4kzttzfq6800klzg/T/iv6i0d/native_add/.dart_tool/native_assets_builder/native_add/c6b312c90c95d2d98ffb6760a738fb36/out/libnative_add.a",
12599
"id": "package:native_add/src/native_add_bindings_generated.dart",
126100
"link_mode": {
127101
"type": "static"
128-
},
129-
"os": "macos"
102+
}
130103
},
131104
"file": "/private/var/folders/2y/mngq9h194yzglt4kzttzfq6800klzg/T/iv6i0d/native_add/.dart_tool/native_assets_builder/native_add/c6b312c90c95d2d98ffb6760a738fb36/out/libnative_add.a",
132105
"id": "package:native_add/src/native_add_bindings_generated.dart",
133106
"link_mode": {
134107
"type": "static"
135108
},
136-
"os": "macos",
137109
"type": "native_code"
138110
}
139111
],
140112
"assets_for_linking": {
141113
"package_with_linker": [
142114
{
143-
"architecture": "arm64",
144115
"encoding": {
145-
"architecture": "arm64",
146116
"file": "/private/var/folders/2y/mngq9h194yzglt4kzttzfq6800klzg/T/iv6i0d/native_add/.dart_tool/native_assets_builder/native_add/c6b312c90c95d2d98ffb6760a738fb36/out/libnative_add.a",
147117
"id": "package:native_add/src/native_add_bindings_generated.dart",
148118
"link_mode": {
149119
"type": "static"
150-
},
151-
"os": "macos"
120+
}
152121
},
153122
"file": "/private/var/folders/2y/mngq9h194yzglt4kzttzfq6800klzg/T/iv6i0d/native_add/.dart_tool/native_assets_builder/native_add/c6b312c90c95d2d98ffb6760a738fb36/out/libnative_add.a",
154123
"id": "package:native_add/src/native_add_bindings_generated.dart",
155124
"link_mode": {
156125
"type": "static"
157126
},
158-
"os": "macos",
159127
"type": "native_code"
160128
}
161129
]

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

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,18 @@
22
"$schema": "../../doc/schema/hook/build_output.generated.schema.json",
33
"assets": [
44
{
5-
"architecture": "x64",
65
"encoding": {
7-
"architecture": "x64",
86
"file": "C:\\src\\dacoharkes\\playground\\my_package\\example\\.dart_tool\\native_assets_builder\\my_package\\190c04c47dc2f9eb26d2411b1968b2cf\\out\\my_package.dll",
97
"id": "package:my_package/my_package_bindings_generated.dart",
108
"link_mode": {
119
"type": "dynamic_loading_bundle"
12-
},
13-
"os": "windows"
10+
}
1411
},
1512
"file": "C:\\src\\dacoharkes\\playground\\my_package\\example\\.dart_tool\\native_assets_builder\\my_package\\190c04c47dc2f9eb26d2411b1968b2cf\\out\\my_package.dll",
1613
"id": "package:my_package/my_package_bindings_generated.dart",
1714
"link_mode": {
1815
"type": "dynamic_loading_bundle"
1916
},
20-
"os": "windows",
2117
"type": "native_code"
2218
}
2319
],

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

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,33 +2,27 @@
22
"$schema": "../../doc/schema/sdk/link_input.generated.schema.json",
33
"assets": [
44
{
5-
"architecture": "arm64",
65
"encoding": {
7-
"architecture": "arm64",
86
"file": "/private/var/folders/2y/mngq9h194yzglt4kzttzfq6800klzg/T/iv6i0d/native_add/.dart_tool/native_assets_builder/native_add/c6b312c90c95d2d98ffb6760a738fb36/out/libnative_add.a",
97
"id": "package:native_add/src/native_add_bindings_generated.dart",
108
"link_mode": {
119
"type": "static"
12-
},
13-
"os": "macos"
10+
}
1411
},
1512
"file": "/private/var/folders/2y/mngq9h194yzglt4kzttzfq6800klzg/T/iv6i0d/native_add/.dart_tool/native_assets_builder/native_add/c6b312c90c95d2d98ffb6760a738fb36/out/libnative_add.a",
1613
"id": "package:native_add/src/native_add_bindings_generated.dart",
1714
"link_mode": {
1815
"type": "static"
1916
},
20-
"os": "macos",
2117
"type": "native_code"
2218
},
2319
{
2420
"encoding": {
25-
"architecture": "arm64",
2621
"file": "/private/var/folders/2y/mngq9h194yzglt4kzttzfq6800klzg/T/iv6i0d/native_add/.dart_tool/native_assets_builder/native_add/c6b312c90c95d2d98ffb6760a738fb36/out/libnative_add.a",
2722
"id": "package:native_add/src/native_add_bindings_generated.dart",
2823
"link_mode": {
2924
"type": "static"
30-
},
31-
"os": "macos"
25+
}
3226
},
3327
"type": "code_assets/code"
3428
}

0 commit comments

Comments
 (0)