Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions packages/flutter_tools/lib/src/android/gradle.dart
Original file line number Diff line number Diff line change
Expand Up @@ -799,6 +799,16 @@ class AndroidGradleBuilder implements AndroidBuilder {
final String aarTask = getAarTaskFor(buildInfo);
final Status status = _logger.startProgress("Running Gradle task '$aarTask'...");

// When a caller runs `flutter build aar` multiple modes in one
// invocation (debug + profile + release), each iteration's trace
// overwrites the previous one. Shorebird's release flow only
// builds release mode, so this isn't a concern in practice.
final AndroidBuildTraceSession? traceSession = AndroidBuildTraceSession.maybeStart(
androidBuildInfo,
_fileSystem,
project.android.buildDirectory,
);

final String flutterRoot = _fileSystem.path.absolute(Cache.flutterRoot!);
final String initScript = _fileSystem.path.join(
flutterRoot,
Expand Down Expand Up @@ -872,8 +882,10 @@ class AndroidGradleBuilder implements AndroidBuilder {
command.add('-Ptarget-platform=$targetPlatforms');
}

command.addAll(traceSession?.extraGradleOptions(aarTask) ?? const <String>[]);
command.add(aarTask);

traceSession?.onGradleAboutToStart();
final sw = Stopwatch()..start();
RunResult result;
try {
Expand All @@ -895,7 +907,10 @@ class AndroidGradleBuilder implements AndroidBuilder {
),
);

traceSession?.onGradleFinished(aarTask);

if (result.exitCode != 0) {
traceSession?.abortOnGradleFailure();
_logger.printStatus(result.stdout, wrap: false);
_logger.printError(result.stderr, wrap: false);
throwToolExit(
Expand All @@ -905,10 +920,12 @@ class AndroidGradleBuilder implements AndroidBuilder {
}
final Directory repoDirectory = getRepoDirectory(outputDirectory);
if (!repoDirectory.existsSync()) {
traceSession?.abortOnGradleFailure();
_logger.printStatus(result.stdout, wrap: false);
_logger.printError(result.stderr, wrap: false);
throwToolExit('Gradle task $aarTask failed to produce $repoDirectory.', exitCode: exitCode);
}
traceSession?.finish(buildTarget: 'aar', printStatus: _logger.printStatus);
_logger.printStatus(
'${_logger.terminal.successMark} '
'Built ${_fileSystem.path.relative(repoDirectory.path)}',
Expand Down
1 change: 1 addition & 0 deletions packages/flutter_tools/lib/src/commands/build_aar.dart
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ class BuildAarCommand extends BuildSubCommand {
usesExtraDartFlagOptions(verboseHelp: verboseHelp);
usesTrackWidgetCreation(verboseHelp: false);
addEnableExperimentation(hide: !verboseHelp);
usesShorebirdTraceOption(hide: !verboseHelp);
addAndroidSpecificBuildOptions(hide: !verboseHelp);
argParser.addMultiOption(
'target-platform',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ abstract class BuildFrameworkCommand extends BuildSubCommand {
addDartObfuscationOption();
usesExtraDartFlagOptions(verboseHelp: verboseHelp);
addEnableExperimentation(hide: !verboseHelp);
usesShorebirdTraceOption(hide: !verboseHelp);

argParser
..addFlag(
Expand Down
1 change: 1 addition & 0 deletions packages/flutter_tools/lib/src/runner/flutter_command.dart
Original file line number Diff line number Diff line change
Expand Up @@ -1163,6 +1163,7 @@ abstract class FlutterCommand extends Command<void> {
usesDartDefineOption();
usesExtraDartFlagOptions(verboseHelp: verboseHelp);
usesPubOption();
usesShorebirdTraceOption(hide: !verboseHelp);
usesTargetOption();
usesTrackWidgetCreation(verboseHelp: verboseHelp);
usesBuildNumberOption();
Expand Down
Loading