Skip to content

Commit ae5db20

Browse files
dcharkesCommit Queue
authored andcommitted
[deps] Roll native_assets_cli to internal import
https://dart-review.googlesource.com/c/sdk/+/346761 can't land, because then flutter_tools in g3 breaks. flutter_tools in g3 can't be forwarded because dart-lang/native#886 isn't in g3 yet. Landing dart-lang/native#886 in g3 should work, because it shouldn't break flutter_tools. Change-Id: Ida60ed22093ace535c00114fc8b088ba2100eb1a Cq-Include-Trybots: luci.dart.try:pkg-linux-debug-try,pkg-linux-release-arm64-try,pkg-mac-release-try,pkg-mac-release-arm64-try,pkg-win-release-try,pkg-win-release-arm64-try Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/346960 Reviewed-by: Moritz Sümmermann <mosum@google.com> Commit-Queue: Daco Harkes <dacoharkes@google.com>
1 parent d506f50 commit ae5db20

File tree

4 files changed

+11
-10
lines changed

4 files changed

+11
-10
lines changed

DEPS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ vars = {
161161
"material_color_utilities_rev": "799b6ba2f3f1c28c67cc7e0b4f18e0c7d7f3c03e",
162162
"mime_rev": "ca9f059d2334bb2657683e0a7f5949817cb4b0e6",
163163
"mockito_rev": "e15e00086ed20f3175b2e677fd11611be4fa8e8e",
164-
"native_rev": "14f6da1d58d23bb0b726e703dd92827a5dafeceb",
164+
"native_rev": "153811080d9020c894c4e820053d2ede79ca9012",
165165
"package_config_rev": "33dd24659147bd7ed2fa87aeacc52d199be766b4",
166166
"path_rev": "57a049cff2e2be7a302dd9683b2b194c6d06e2d4",
167167
"pool_rev": "4c490001446d8ba3d361b99d8befd6a4f61abc7a",

pkg/dartdev/lib/src/commands/build.dart

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import 'package:dartdev/src/sdk.dart';
1212
import 'package:front_end/src/api_prototype/compiler_options.dart'
1313
show Verbosity;
1414
import 'package:native_assets_builder/native_assets_builder.dart';
15-
import 'package:native_assets_cli/native_assets_cli.dart';
15+
import 'package:native_assets_cli/native_assets_cli_internal.dart';
1616
import 'package:path/path.dart' as path;
1717
import 'package:vm/target_os.dart'; // For possible --target-os values.
1818

@@ -152,16 +152,16 @@ Use linkMode as dynamic library instead.""");
152152
stdout.writeln('Copying native assets.');
153153
Asset targetLocation(Asset asset) {
154154
final path = asset.path;
155-
switch (path.runtimeType) {
156-
case const (AssetSystemPath):
157-
case const (AssetInExecutable):
158-
case const (AssetInProcess):
155+
switch (path) {
156+
case AssetSystemPath _:
157+
case AssetInExecutable _:
158+
case AssetInProcess _:
159159
return asset;
160-
case const (AssetAbsolutePath):
160+
case AssetAbsolutePath _:
161161
return asset.copyWith(
162162
path: AssetRelativePath(
163163
Uri(
164-
path: (path as AssetAbsolutePath).uri.pathSegments.last,
164+
path: path.uri.pathSegments.last,
165165
),
166166
),
167167
);

pkg/dartdev/lib/src/native_assets.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import 'dart:io';
88
import 'package:dartdev/src/sdk.dart';
99
import 'package:logging/logging.dart';
1010
import 'package:native_assets_builder/native_assets_builder.dart';
11-
import 'package:native_assets_cli/native_assets_cli.dart';
11+
import 'package:native_assets_cli/native_assets_cli_internal.dart';
1212

1313
import 'core.dart';
1414

pkg/test_runner/lib/src/configuration.dart

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ import 'dart:convert';
77
import 'dart:ffi';
88
import 'dart:io';
99

10-
import 'package:native_assets_cli/native_assets_cli.dart' show CCompilerConfig;
10+
import 'package:native_assets_cli/native_assets_cli_internal.dart'
11+
show CCompilerConfig;
1112
import 'package:smith/configuration.dart';
1213
import 'package:smith/smith.dart';
1314

0 commit comments

Comments
 (0)