roll engine and update tools for the removal of dart:jni (#9137)

bin/internal/engine.version

-0005285781cd8eab7a43571bccdaad8354c6faa4
+4c05830aafb75c2893ea98bfd932ac95e883bce2

packages/flutter_tools/lib/src/artifacts.dart

@@ -11,7 +11,6 @@ import 'globals.dart';
 enum Artifact {
   dartIoEntriesTxt,
   dartVmEntryPointsTxt,
-  dartVmEntryPointsAndroidTxt,
   genSnapshot,
   flutterTester,
   snapshotDart,
@@ -26,8 +25,6 @@ String _artifactToFileName(Artifact artifact) {
       return 'dart_io_entries.txt';
     case Artifact.dartVmEntryPointsTxt:
       return 'dart_vm_entry_points.txt';
-    case Artifact.dartVmEntryPointsAndroidTxt:
-      return 'dart_vm_entry_points_android.txt';
     case Artifact.genSnapshot:
       return 'gen_snapshot';
     case Artifact.flutterTester:
@@ -94,7 +91,6 @@ class CachedArtifacts extends Artifacts {
     switch (artifact) {
       case Artifact.dartIoEntriesTxt:
       case Artifact.dartVmEntryPointsTxt:
-      case Artifact.dartVmEntryPointsAndroidTxt:
         assert(mode != BuildMode.debug, 'Artifact $artifact only available in non-debug mode.');
         return fs.path.join(engineDir, _artifactToFileName(artifact));
       case Artifact.genSnapshot:
@@ -192,7 +188,6 @@ class LocalEngineArtifacts extends Artifacts {
       case Artifact.dartIoEntriesTxt:
         return fs.path.join(_engineSrcPath, 'dart', 'runtime', 'bin', _artifactToFileName(artifact));
       case Artifact.dartVmEntryPointsTxt:
-      case Artifact.dartVmEntryPointsAndroidTxt:
         return fs.path.join(_engineSrcPath, 'flutter', 'runtime', _artifactToFileName(artifact));
       case Artifact.snapshotDart:
         return fs.path.join(_engineSrcPath, 'flutter', 'lib', 'snapshot', _artifactToFileName(artifact));

packages/flutter_tools/lib/src/commands/build_aot.dart

@@ -147,20 +147,15 @@ Future<String> _buildAotSnapshot(
 
   final String skyEnginePkg = _getSdkExtensionPath(packageMap, 'sky_engine');
   final String uiPath = fs.path.join(skyEnginePkg, 'dart_ui', 'ui.dart');
-  final String jniPath = fs.path.join(skyEnginePkg, 'dart_jni', 'jni.dart');
   final String vmServicePath = fs.path.join(skyEnginePkg, 'sdk_ext', 'vmservice_io.dart');
 
   final List<String> filePaths = <String>[
     vmEntryPoints,
     ioEntryPoints,
     uiPath,
-    jniPath,
     vmServicePath,
   ];
 
-  // These paths are used only on Android.
-  String vmEntryPointsAndroid;
-
   // These paths are used only on iOS.
   String snapshotDartIOS;
   String assembly;
@@ -169,10 +164,6 @@ Future<String> _buildAotSnapshot(
     case TargetPlatform.android_arm:
     case TargetPlatform.android_x64:
     case TargetPlatform.android_x86:
-      vmEntryPointsAndroid = artifacts.getArtifactPath(Artifact.dartVmEntryPointsAndroidTxt, platform, buildMode);
-      filePaths.addAll(<String>[
-        vmEntryPointsAndroid,
-      ]);
       break;
     case TargetPlatform.ios:
       snapshotDartIOS = artifacts.getArtifactPath(Artifact.snapshotDart, platform, buildMode);
@@ -206,7 +197,6 @@ Future<String> _buildAotSnapshot(
     '--isolate_snapshot_data=$isolateSnapshotData',
     '--packages=${packageMap.packagesPath}',
     '--url_mapping=dart:ui,$uiPath',
-    '--url_mapping=dart:jni,$jniPath',
     '--url_mapping=dart:vmservice_sky,$vmServicePath',
     '--print_snapshot_sizes',
     '--dependencies=$dependencies',
@@ -225,7 +215,6 @@ Future<String> _buildAotSnapshot(
         '--snapshot_kind=app-aot-blobs',
         '--vm_snapshot_instructions=$vmSnapshotInstructions',
         '--isolate_snapshot_instructions=$isolateSnapshotInstructions',
-        '--embedder_entry_points_manifest=$vmEntryPointsAndroid',
         '--no-sim-use-hardfp',  // Android uses the softfloat ABI.
         '--no-use-integer-division',  // Not supported by the Pixel in 32-bit mode.
       ]);