diff --git a/bin/internal/flutter.version b/bin/internal/flutter.version index 479e6281..1def4a78 100644 --- a/bin/internal/flutter.version +++ b/bin/internal/flutter.version @@ -1 +1 @@ -ba393198430278b6595976de84fe170f553cc728 \ No newline at end of file +03b5ea519aa42172bb2789898ed01bdc169ec481 \ No newline at end of file diff --git a/lib/build_targets/application.dart b/lib/build_targets/application.dart index 5fc40634..96d2bde5 100644 --- a/lib/build_targets/application.dart +++ b/lib/build_targets/application.dart @@ -14,7 +14,6 @@ import 'package:flutter_tools/src/build_system/targets/android.dart'; import 'package:flutter_tools/src/build_system/targets/assets.dart'; import 'package:flutter_tools/src/build_system/targets/common.dart'; import 'package:flutter_tools/src/build_system/targets/icon_tree_shaker.dart'; -import 'package:flutter_tools/src/build_system/targets/shader_compiler.dart'; import 'package:flutter_tools/src/compile.dart'; import 'package:flutter_tools/src/dart/package_map.dart'; import 'package:package_config/src/package_config.dart'; @@ -157,7 +156,6 @@ abstract class TizenAssetBundle extends Target { environment, outputDirectory, targetPlatform: TargetPlatform.android, - shaderTarget: ShaderTarget.sksl, ); final DepfileService depfileService = DepfileService( fileSystem: environment.fileSystem, diff --git a/lib/commands/test.dart b/lib/commands/test.dart index 6b273888..50636a6d 100644 --- a/lib/commands/test.dart +++ b/lib/commands/test.dart @@ -11,6 +11,7 @@ import 'package:flutter_tools/src/dart/language_version.dart'; import 'package:flutter_tools/src/dart/package_map.dart'; import 'package:flutter_tools/src/device.dart'; import 'package:flutter_tools/src/globals.dart' as globals; +import 'package:flutter_tools/src/native_assets.dart'; import 'package:flutter_tools/src/project.dart'; import 'package:flutter_tools/src/runner/flutter_command.dart'; import 'package:flutter_tools/src/test/runner.dart'; @@ -132,6 +133,7 @@ void main() { Device? integrationTestDevice, String? integrationTestUserIdentifier, TestTimeRecorder? testTimeRecorder, + TestCompilerNativeAssetsBuilder? nativeAssetsBuilder, }) async { if (isIntegrationTest) { testFiles = await _generateEntrypointWrappers(testFiles); @@ -167,6 +169,57 @@ void main() { integrationTestDevice: integrationTestDevice, integrationTestUserIdentifier: integrationTestUserIdentifier, testTimeRecorder: testTimeRecorder, + nativeAssetsBuilder: nativeAssetsBuilder, + ); + } + + @override + Future runTestsBySpawningLightweightEngines(List testFiles, + {required DebuggingOptions debuggingOptions, + List names = const [], + List plainNames = const [], + String? tags, + String? excludeTags, + bool machine = false, + bool updateGoldens = false, + required int? concurrency, + String? testAssetDirectory, + FlutterProject? flutterProject, + String? icudtlPath, + String? randomSeed, + String? reporter, + String? fileReporter, + String? timeout, + bool runSkipped = false, + int? shardIndex, + int? totalShards, + TestTimeRecorder? testTimeRecorder, + TestCompilerNativeAssetsBuilder? nativeAssetsBuilder}) async { + if (isIntegrationTest) { + testFiles = await _generateEntrypointWrappers(testFiles); + } + return testRunner.runTestsBySpawningLightweightEngines( + testFiles, + debuggingOptions: debuggingOptions, + names: names, + plainNames: plainNames, + tags: tags, + excludeTags: excludeTags, + machine: machine, + updateGoldens: updateGoldens, + concurrency: concurrency, + testAssetDirectory: testAssetDirectory, + flutterProject: flutterProject, + icudtlPath: icudtlPath, + randomSeed: randomSeed, + reporter: reporter, + fileReporter: fileReporter, + timeout: timeout, + runSkipped: runSkipped, + shardIndex: shardIndex, + totalShards: totalShards, + testTimeRecorder: testTimeRecorder, + nativeAssetsBuilder: nativeAssetsBuilder, ); } }