Revert "Pass entry points JSON files to front-end server" (#15223)

* Revert "Pass entry points JSON files to front-end server (#15180)"

This reverts commit 0edea887.

Reason: buildbot failures on Mac.

packages/flutter_tools/lib/src/artifacts.dart

@@ -15,8 +15,6 @@ import 'globals.dart';
 enum Artifact {
   dartIoEntriesTxt,
   dartVmEntryPointsTxt,
-  entryPointsJson,
-  entryPointsExtraJson,
   genSnapshot,
   flutterTester,
   snapshotDart,
@@ -37,10 +35,6 @@ String _artifactToFileName(Artifact artifact) {
       return 'dart_io_entries.txt';
     case Artifact.dartVmEntryPointsTxt:
       return 'dart_vm_entry_points.txt';
-    case Artifact.entryPointsJson:
-      return 'entry_points.json';
-    case Artifact.entryPointsExtraJson:
-      return 'entry_points_extra.json';
     case Artifact.genSnapshot:
       return 'gen_snapshot';
     case Artifact.flutterTester:
@@ -130,8 +124,6 @@ class CachedArtifacts extends Artifacts {
     switch (artifact) {
       case Artifact.dartIoEntriesTxt:
       case Artifact.dartVmEntryPointsTxt:
-      case Artifact.entryPointsJson:
-      case Artifact.entryPointsExtraJson:
       case Artifact.frontendServerSnapshotForEngineDartSdk:
         assert(mode != BuildMode.debug, 'Artifact $artifact only available in non-debug mode.');
         return fs.path.join(engineDir, _artifactToFileName(artifact));
@@ -150,8 +142,6 @@ class CachedArtifacts extends Artifacts {
     switch (artifact) {
       case Artifact.dartIoEntriesTxt:
       case Artifact.dartVmEntryPointsTxt:
-      case Artifact.entryPointsJson:
-      case Artifact.entryPointsExtraJson:
       case Artifact.genSnapshot:
       case Artifact.snapshotDart:
       case Artifact.flutterFramework:
@@ -246,9 +236,6 @@ class LocalEngineArtifacts extends Artifacts {
         return fs.path.join(_engineSrcPath, 'third_party', 'dart', 'runtime', 'bin', _artifactToFileName(artifact));
       case Artifact.dartVmEntryPointsTxt:
         return fs.path.join(_engineSrcPath, 'flutter', 'runtime', _artifactToFileName(artifact));
-      case Artifact.entryPointsJson:
-      case Artifact.entryPointsExtraJson:
-        return fs.path.join(engineOutPath, 'dart_entry_points', _artifactToFileName(artifact));
       case Artifact.snapshotDart:
         return fs.path.join(_engineSrcPath, 'flutter', 'lib', 'snapshot', _artifactToFileName(artifact));
       case Artifact.genSnapshot:

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

@@ -187,8 +187,6 @@ Future<String> _buildAotSnapshot(
     buildMode,
   );
   final String ioEntryPoints = artifacts.getArtifactPath(Artifact.dartIoEntriesTxt, platform, buildMode);
-  final String entryPointsJson = artifacts.getArtifactPath(Artifact.entryPointsJson, platform, buildMode);
-  final String entryPointsExtraJson = artifacts.getArtifactPath(Artifact.entryPointsExtraJson, platform, buildMode);
 
   final PackageMap packageMap = new PackageMap(PackageMap.globalPackagesPath);
   final String packageMapError = packageMap.checkValid();
@@ -209,13 +207,6 @@ Future<String> _buildAotSnapshot(
     mainPath,
   ];
 
-  if (previewDart2) {
-    inputPaths.addAll(<String>[
-      entryPointsJson,
-      entryPointsExtraJson,
-    ]);
-  }
-
   final Set<String> outputPaths = new Set<String>();
 
   // These paths are used only on iOS.
@@ -380,7 +371,6 @@ Future<String> _buildAotSnapshot(
       extraFrontEndOptions: extraFrontEndOptions,
       linkPlatformKernelIn : true,
       aot : true,
-      entryPointsJsonFiles: <String>[entryPointsJson, entryPointsExtraJson],
       trackWidgetCreation: false,
     );
     if (mainPath == null) {

packages/flutter_tools/lib/src/compile.dart

@@ -48,7 +48,6 @@ Future<String> compile(
     String depFilePath,
     bool linkPlatformKernelIn: false,
     bool aot: false,
-    List<String> entryPointsJsonFiles,
     bool trackWidgetCreation: false,
     List<String> extraFrontEndOptions,
     String incrementalCompilerByteStorePath,
@@ -75,11 +74,6 @@ Future<String> compile(
   if (aot) {
     command.add('--aot');
   }
-  if (entryPointsJsonFiles != null) {
-    for (String entryPointsJson in entryPointsJsonFiles) {
-      command.addAll(<String>['--entry-points', entryPointsJson]);
-    }
-  }
   if (incrementalCompilerByteStorePath != null) {
     command.add('--incremental');
   }

packages/flutter_tools/test/artifacts_test.dart

@@ -31,10 +31,6 @@ void main() {
           artifacts.getArtifactPath(Artifact.flutterFramework, TargetPlatform.ios, BuildMode.release),
           fs.path.join(tempDir.path, 'bin', 'cache', 'artifacts', 'engine', 'ios-release', 'Flutter.framework')
       );
-      expect(
-          artifacts.getArtifactPath(Artifact.entryPointsExtraJson, TargetPlatform.android_arm64, BuildMode.release),
-          fs.path.join(tempDir.path, 'bin', 'cache', 'artifacts', 'engine', 'android-arm64-release', 'entry_points_extra.json')
-      );
       expect(
           artifacts.getArtifactPath(Artifact.flutterTester),
           fs.path.join(tempDir.path, 'bin', 'cache', 'artifacts', 'engine', 'linux-x64', 'flutter_tester')
@@ -85,10 +81,6 @@ void main() {
           artifacts.getArtifactPath(Artifact.dartIoEntriesTxt, TargetPlatform.android_arm, BuildMode.debug),
           fs.path.join(tempDir.path, 'third_party', 'dart', 'runtime', 'bin', 'dart_io_entries.txt')
       );
-      expect(
-          artifacts.getArtifactPath(Artifact.entryPointsJson, TargetPlatform.android_arm, BuildMode.profile),
-          fs.path.join(tempDir.path, 'out', 'android_debug_unopt', 'dart_entry_points', 'entry_points.json')
-      );
       expect(
           artifacts.getArtifactPath(Artifact.flutterFramework, TargetPlatform.ios, BuildMode.release),
           fs.path.join(tempDir.path, 'out', 'android_debug_unopt', 'Flutter.framework')