DEV/flutter_flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2026-02-20 02:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add an option to link platform.dill into app kernel file (flutter/engine#4204)

Browse Source
This commit is contained in:
Alexander Aprelev 2017-10-12 10:11:47 -07:00 committed by GitHub
parent cf981ae074
commit df45191b54
2 changed files with 36 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
engine/src/flutter/frontend_server/lib/server.dart
View File

@ -30,7 +30,14 @@ ArgParser _argParser = new ArgParser(allowTrailingOptions: true)
..addOption('byte-store',
help: 'Path to file byte store used to keep incremental compiler state.'
' If omitted, then memory byte store is used.',
defaultsTo: null);
defaultsTo: null)
..addFlag('link-platform',
help: 'When in batch mode, link platform kernel file into result kernel file.'
' Intended use is to satisfy different loading strategies implemented'
' by gen_snapshot(which needs platform embedded) vs'
' Flutter engine(which does not)',
defaultsTo: true);
String _usage = '''
Usage: server [options] [input.dart]
@ -156,11 +163,13 @@ class _FrontendCompiler implements CompilerInterface {
final DeltaProgram deltaProgram = await _generator.computeDelta();
program = deltaProgram.newProgram;
} else {
// TODO(aam): Remove linkedDependencies once platform is directly embedded
// into VM snapshot and http://dartbug.com/30111 is fixed.
compilerOptions.linkedDependencies = <Uri>[
sdkRoot.resolve('platform.dill')
];
if (options['link-platform']) {
// TODO(aam): Remove linkedDependencies once platform is directly embedded
// into VM snapshot and http://dartbug.com/30111 is fixed.
compilerOptions.linkedDependencies = <Uri>[
sdkRoot.resolve('platform.dill')
];
}
program = await kernelForProgram(Uri.base.resolve(_filename), compilerOptions);
}
if (program != null) {

21
engine/src/flutter/frontend_server/test/server_test.dart
View File

@ -69,6 +69,27 @@ Future<int> main() async {
expect(capturedArgs.single['sdk-root'], equals('sdkroot'));
expect(capturedArgs.single['byte-store'], equals('path/to/bytestore'));
});
test('compile from command line with link platform', () async {
final List<String> args = <String>[
'server.dart',
'--sdk-root',
'sdkroot',
'--link-platform',
];
final int exitcode = await starter(args, compiler: compiler);
expect(exitcode, equals(0));
final List<ArgResults> capturedArgs =
verify(
compiler.compile(
argThat(equals('server.dart')),
captureAny,
generator: any,
)
).captured;
expect(capturedArgs.single['sdk-root'], equals('sdkroot'));
expect(capturedArgs.single['link-platform'], equals(true));
});
});
group('interactive file store compile with mocked compiler', () {