firka/flutter
firka/flutter
5
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Revert "Include fragment support in Android build to allow use of FragmentActivity in FlutterActivity (#9036)"" (#9046)

Browse Source 
Increased the time limit slightly to allow the microbenchmark test time to finish.
This commit is contained in:
Collin Jackson 2017-03-27 18:12:14 -07:00 committed by GitHub
parent c346d51dcb
commit 864b3c37c6
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dev/devicelab/lib/framework/framework.dart
View File

@ -16,7 +16,7 @@ import 'utils.dart';
/// Maximum amount of time a single task is allowed to take to run. /// Maximum amount of time a single task is allowed to take to run.
/// ///
/// If exceeded the task is considered to have failed. /// If exceeded the task is considered to have failed.
const Duration taskTimeout = const Duration(minutes: 10); const Duration taskTimeout = const Duration(minutes: 15);
/// Represents a unit of work performed in the CI environment that can /// Represents a unit of work performed in the CI environment that can
/// succeed, fail and be retried independently of others. /// succeed, fail and be retried independently of others.

5
packages/flutter_tools/gradle/flutter.gradle
View File

@ -137,6 +137,11 @@ class FlutterPlugin implements Plugin<Project> {
} }
} }
project.dependencies {
// FlutterActivity extends FragmentActivity
compile 'com.android.support:support-fragment:24.2.0+'
}
project.extensions.create("flutter", FlutterExtension) project.extensions.create("flutter", FlutterExtension)
project.afterEvaluate this.&addFlutterTask project.afterEvaluate this.&addFlutterTask