Skip to content

Commit d40127d

Browse files
authored
[native_assets_builder] Fix 2149 (#2171)
1 parent 6035842 commit d40127d

File tree

2 files changed

+12
-5
lines changed

2 files changed

+12
-5
lines changed

pkgs/native_assets_builder/lib/src/build_runner/build_runner.dart

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ class NativeAssetsBuildRunner {
189189
);
190190
if (buildPlan == null) return null;
191191

192-
var hookResult = HookResult(encodedAssets: buildResult.encodedAssets);
192+
var linkResult = HookResult();
193193
for (final package in buildPlan) {
194194
final inputBuilder = LinkInputBuilder();
195195
for (final e in extensions) {
@@ -250,14 +250,17 @@ class NativeAssetsBuildRunner {
250250
);
251251
if (result == null) return null;
252252
final (hookOutput, hookDeps) = result;
253-
hookResult = hookResult.copyAdd(hookOutput, hookDeps);
253+
linkResult = linkResult.copyAdd(hookOutput, hookDeps);
254254
}
255255

256256
final errors = [
257257
for (final e in extensions)
258-
...await e.validateApplicationAssets(hookResult.encodedAssets),
258+
...await e.validateApplicationAssets([
259+
...buildResult.encodedAssets,
260+
...linkResult.encodedAssets,
261+
]),
259262
];
260-
if (errors.isEmpty) return hookResult;
263+
if (errors.isEmpty) return linkResult;
261264

262265
_printErrors('Application asset verification failed', errors);
263266
return null;

pkgs/native_assets_builder/test/build_runner/link_test.dart

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,9 +88,13 @@ void main() async {
8888
);
8989
expect(linkResult, isNotNull);
9090

91+
expect(
92+
_getNames(buildResult.encodedAssets),
93+
unorderedEquals(builtHelperAssets),
94+
);
9195
expect(
9296
_getNames(linkResult!.encodedAssets),
93-
unorderedEquals([...builtHelperAssets, ...linkedAssets]),
97+
unorderedEquals(linkedAssets),
9498
);
9599
});
96100
});

0 commit comments

Comments
 (0)