Download Android AOT tools to the artifacts cache and build APKs using these tools (#3649)
Also update the engine to a build where these tools have been uplaoded
diff --git a/packages/flutter_tools/lib/src/build_configuration.dart b/packages/flutter_tools/lib/src/build_configuration.dart
index abe98aa..a70e691 100644
--- a/packages/flutter_tools/lib/src/build_configuration.dart
+++ b/packages/flutter_tools/lib/src/build_configuration.dart
@@ -24,6 +24,11 @@
String getModeName(BuildMode mode) => getEnumName(mode);
+// Returns true if the selected build mode uses ahead-of-time compilation.
+bool isAotBuildMode(BuildMode mode) {
+ return mode == BuildMode.profile || mode == BuildMode.release;
+}
+
enum HostPlatform {
darwin_x64,
linux_x64,
diff --git a/packages/flutter_tools/lib/src/cache.dart b/packages/flutter_tools/lib/src/cache.dart
index 0b12dfd..ec976ce 100644
--- a/packages/flutter_tools/lib/src/cache.dart
+++ b/packages/flutter_tools/lib/src/cache.dart
@@ -190,6 +190,7 @@
List<String> _getEngineDirs() {
List<String> dirs = <String>[
'android-arm',
+ 'android-arm-profile',
'android-arm-release',
'android-x64'
];
@@ -202,13 +203,18 @@
return dirs;
}
- List<String> _getToolsDirs() {
+ // Return a list of (cache directory path, download URL path) tuples.
+ List<List<String>> _getToolsDirs() {
if (Platform.isMacOS)
- return <String>['darwin-x64'];
+ return <List<String>>[['darwin-x64', 'darwin-x64/artifacts.zip']];
else if (Platform.isLinux)
- return <String>['linux-x64'];
+ return <List<String>>[
+ ['linux-x64', 'linux-x64/artifacts.zip'],
+ ['android-arm-profile/linux-x64', 'android-arm-profile/linux-x64.zip'],
+ ['android-arm-release/linux-x64', 'android-arm-release/linux-x64.zip'],
+ ];
else
- return <String>[];
+ return <List<String>>[];
}
bool isUpToDate() {
@@ -226,8 +232,8 @@
return false;
}
- for (String dirName in _getToolsDirs()) {
- Directory dir = new Directory(path.join(engineDir.path, dirName));
+ for (List<String> toolsDir in _getToolsDirs()) {
+ Directory dir = new Directory(path.join(engineDir.path, toolsDir[0]));
if (!dir.existsSync())
return false;
}
@@ -259,11 +265,13 @@
}
}
- for (String dirName in _getToolsDirs()) {
- Directory dir = new Directory(path.join(engineDir.path, dirName));
+ for (List<String> toolsDir in _getToolsDirs()) {
+ String cacheDir = toolsDir[0];
+ String urlPath = toolsDir[1];
+ Directory dir = new Directory(path.join(engineDir.path, cacheDir));
if (!dir.existsSync() || allDirty) {
- await _downloadItem('Downloading engine tools $dirName...',
- url + dirName + '/artifacts.zip', dir);
+ await _downloadItem('Downloading engine tools $cacheDir...',
+ url + urlPath, dir);
_makeFilesExecutable(dir);
}
}
diff --git a/packages/flutter_tools/lib/src/commands/build_aot.dart b/packages/flutter_tools/lib/src/commands/build_aot.dart
index b25b555..10ecd93 100644
--- a/packages/flutter_tools/lib/src/commands/build_aot.dart
+++ b/packages/flutter_tools/lib/src/commands/build_aot.dart
@@ -32,13 +32,13 @@
final String name = 'aot';
@override
- final String description = "Build an ahead-of-time compiled snapshot of your app's Dart code. "
- "(local engine builds only)";
+ final String description = "Build an ahead-of-time compiled snapshot of your app's Dart code.";
@override
Future<int> runInProject() async {
String outputPath = buildAotSnapshot(
findMainDartFile(argResults['target']),
+ getBuildMode(),
outputPath: argResults['output-dir']
);
if (outputPath == null)
@@ -55,18 +55,30 @@
}
String buildAotSnapshot(
- String mainPath, {
+ String mainPath,
+ BuildMode buildMode, {
String outputPath: _kDefaultAotOutputDir
}) {
- String engineSrc = tools.engineSrcPath;
- if (engineSrc == null) {
- printError('AOT compilation requires --engine-src-path');
+ if (!isAotBuildMode(buildMode)) {
+ printError('${getModeName(buildMode)} mode does not support AOT compilation.');
return null;
}
- String engineOut = tools.getEngineArtifactsDirectory(
- TargetPlatform.android_arm, BuildMode.profile).path;
- String genSnapshot = path.join(engineOut, 'clang_x86', 'gen_snapshot');
+ String entryPointsDir, genSnapshot;
+
+ String engineSrc = tools.engineSrcPath;
+ if (engineSrc != null) {
+ entryPointsDir = path.join(engineSrc, 'sky', 'engine', 'bindings');
+ String engineOut = tools.getEngineArtifactsDirectory(
+ TargetPlatform.android_arm, buildMode).path;
+ genSnapshot = path.join(engineOut, 'clang_x86', 'gen_snapshot');
+ } else {
+ String artifactsDir = tools.getEngineArtifactsDirectory(
+ TargetPlatform.android_arm, buildMode).path;
+ entryPointsDir = artifactsDir;
+ String hostToolsDir = path.join(artifactsDir, getNameForHostPlatform(getCurrentHostPlatform()));
+ genSnapshot = path.join(hostToolsDir, 'gen_snapshot');
+ }
Directory outputDir = new Directory(outputPath);
outputDir.createSync(recursive: true);
@@ -75,9 +87,8 @@
String instructionsBlob = path.join(outputDir.path, 'snapshot_aot_instr');
String rodataBlob = path.join(outputDir.path, 'snapshot_aot_rodata');
- String bindingsSrc = path.join(engineSrc, 'sky', 'engine', 'bindings');
- String vmEntryPoints = path.join(bindingsSrc, 'dart_vm_entry_points.txt');
- String vmEntryPointsAndroid = path.join(bindingsSrc, 'dart_vm_entry_points_android.txt');
+ String vmEntryPoints = path.join(entryPointsDir, 'dart_vm_entry_points.txt');
+ String vmEntryPointsAndroid = path.join(entryPointsDir, 'dart_vm_entry_points_android.txt');
String packagesPath = path.absolute(Directory.current.path, 'packages');
if (!FileSystemEntity.isDirectorySync(packagesPath)) {
@@ -119,7 +130,7 @@
'--no-sim-use-hardfp',
];
- if (!tools.engineRelease) {
+ if (!(tools.engineRelease || buildMode == BuildMode.release)) {
genSnapshotCmd.addAll([
'--no-checked',
'--conditional_directives',
diff --git a/packages/flutter_tools/lib/src/commands/build_apk.dart b/packages/flutter_tools/lib/src/commands/build_apk.dart
index 2dd9426..f784dd5 100644
--- a/packages/flutter_tools/lib/src/commands/build_apk.dart
+++ b/packages/flutter_tools/lib/src/commands/build_apk.dart
@@ -428,9 +428,6 @@
return false;
}
-// Returns true if the selected build mode uses ahead-of-time compilation.
-bool _isAotBuildMode(BuildMode mode) => mode == BuildMode.profile;
-
Future<int> buildAndroid(
TargetPlatform platform,
BuildMode buildMode, {
@@ -494,13 +491,13 @@
flxPath = await flx.buildFlx(
toolchain,
mainPath: findMainDartFile(target),
- precompiledSnapshot: _isAotBuildMode(buildMode),
+ precompiledSnapshot: isAotBuildMode(buildMode),
includeRobotoFonts: false);
}
// Build an AOT snapshot if needed.
- if (_isAotBuildMode(buildMode) && aotPath == null) {
- aotPath = buildAotSnapshot(findMainDartFile(target));
+ if (isAotBuildMode(buildMode) && aotPath == null) {
+ aotPath = buildAotSnapshot(findMainDartFile(target), buildMode);
if (aotPath == null) {
printError('Failed to build AOT snapshot');
return 1;
@@ -508,7 +505,7 @@
}
if (aotPath != null) {
- if (!_isAotBuildMode(buildMode)) {
+ if (!isAotBuildMode(buildMode)) {
printError('AOT snapshot can not be used in build mode $buildMode');
return 1;
}
diff --git a/packages/flutter_tools/lib/src/runner/flutter_command.dart b/packages/flutter_tools/lib/src/runner/flutter_command.dart
index 1ebc038..71f6dd1 100644
--- a/packages/flutter_tools/lib/src/runner/flutter_command.dart
+++ b/packages/flutter_tools/lib/src/runner/flutter_command.dart
@@ -66,7 +66,6 @@
negatable: false,
help: 'Build a debug version of your app (the default).');
argParser.addFlag('profile',
- hide: true,
negatable: false,
help: 'Build a profile (ahead of time compilation) version of your app.');
argParser.addFlag('release',
diff --git a/packages/flutter_tools/lib/src/toolchain.dart b/packages/flutter_tools/lib/src/toolchain.dart
index 2a7a557..92ecb98 100644
--- a/packages/flutter_tools/lib/src/toolchain.dart
+++ b/packages/flutter_tools/lib/src/toolchain.dart
@@ -163,13 +163,12 @@
// Return something like 'out/android_Release'.
String buildOutputPath = 'out/${type}_$_modeStr';
- if (mode == BuildMode.profile)
+ if (isAotBuildMode(mode))
buildOutputPath += '_Deploy';
return new Directory(path.join(engineSrcPath, buildOutputPath));
} else {
- // For now, only suffix for deploy variants.
- String suffix = mode == BuildMode.release ? '-${getModeName(mode)}' : '';
+ String suffix = mode != BuildMode.debug ? '-${getModeName(mode)}' : '';
// Create something like `android-arm` or `android-arm-release`.
String dirName = getNameForTargetPlatform(platform) + suffix;
