github.com/flutter/flutter changes required to use kernel

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

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 import 'dart:async';
 import 'dart:convert' show JSON;
 import 'dart:io';
 
 import 'package:path/path.dart' as path;
 
@@ skipping 535 matching lines @@
       mainPath: findMainDartFile(target),
       precompiledSnapshot: isAotBuildMode(buildMode),
       includeRobotoFonts: false);
 
     if (flxPath == null)
       throwToolExit(null);
   }
 
   // Build an AOT snapshot if needed.
   if (isAotBuildMode(buildMode) && aotPath == null) {
-    aotPath = await buildAotSnapshot(findMainDartFile(target), platform, buildMode);
-    if (aotPath == null)
+    String dartFile = findMainDartFile(target);
+    String dillFile = await buildDilFile(dartFile);
+    aotPath = await buildAotSnapshot(dillFile != null ? dillFile : dartFile, platform, buildMode);
+    if (aotPath == null) {
       throwToolExit('Failed to build AOT snapshot');
+    }
   }
 
   if (aotPath != null) {
     if (!isAotBuildMode(buildMode))
       throwToolExit('AOT snapshot can not be used in build mode $buildMode');
     if (!FileSystemEntity.isDirectorySync(aotPath))
       throwToolExit('AOT snapshot does not exist: $aotPath');
     for (String aotFilename in kAotSnapshotFiles) {
       String aotFilePath = path.join(aotPath, aotFilename);
       if (!FileSystemEntity.isFileSync(aotFilePath))
@@ skipping 77 matching lines @@
 }
 
 String _getTargetBuildTypeToken(TargetPlatform platform, BuildMode buildMode, File outputBinary) {
   String buildType = getNameForTargetPlatform(platform) + '-' + getModeName(buildMode);
   if (tools.isLocalEngine)
     buildType += ' [${tools.engineBuildPath}]';
   if (outputBinary.existsSync())
     buildType += ' [${outputBinary.lastModifiedSync().millisecondsSinceEpoch}]';
   return buildType;
 }