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

[flutter_tools] add --dart-define option for fuchsia build (#55715)

Browse Source
This commit is contained in:
michaellee8 2020-04-28 05:59:03 +08:00 committed by GitHub
parent 7eb3df4a11
commit 34b8f830b8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 101 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
AUTHORS
View File

@ -52,3 +52,4 @@ Alek Åström <alek.astrom@gmail.com>
Efthymios Sarpmpanis <e.sarbanis@gmail.com>
Cédric Wyss <cedi.wyss@gmail.com>
Michel Feinstein <michel@feinstein.com.br>
Michael Lee <ckmichael8@gmail.com>

1
packages/flutter_tools/lib/src/commands/build_fuchsia.dart
View File

@ -19,6 +19,7 @@ class BuildFuchsiaCommand extends BuildSubCommand {
BuildFuchsiaCommand({bool verboseHelp = false}) {
addTreeShakeIconsFlag();
usesTargetOption();
usesDartDefineOption();
addBuildModeFlags(verboseHelp: verboseHelp);
argParser.addOption(
'runner-source',

69
packages/flutter_tools/lib/src/fuchsia/fuchsia_kernel_compiler.dart
View File

@ -56,28 +56,7 @@ class FuchsiaKernelCompiler {
'--packages', '$multiRootScheme:///$relativePackagesFile',
'--output', globals.fs.path.join(outDir, '$appName.dil'),
'--component-name', appName,
// AOT/JIT:
if (buildInfo.usesAot) ...<String>['--aot', '--tfa']
else ...<String>[
'--no-link-platform',
'--split-output-by-packages',
'--manifest', manifestPath
],
// debug, profile, jit release, release:
if (buildInfo.isDebug) '--embed-sources'
else '--no-embed-sources',
if (buildInfo.isProfile) '-Ddart.vm.profile=true',
if (buildInfo.mode.isRelease) '-Ddart.vm.release=true',
'-Ddart.developer.causal_async_stacks=${buildInfo.isDebug}',
// Use bytecode and drop the ast in JIT release mode.
if (buildInfo.isJitRelease) ...<String>[
'--gen-bytecode',
'--drop-ast',
],
...getBuildInfoFlags(buildInfo: buildInfo, manifestPath: manifestPath)
];
flags += <String>[
@ -103,4 +82,50 @@ class FuchsiaKernelCompiler {
throwToolExit('Build process failed');
}
}
/// Provide flags that are affected by [BuildInfo]
@visibleForTesting
static List<String> getBuildInfoFlags({
@required BuildInfo buildInfo,
@required String manifestPath,
}) {
return <String>[
// AOT/JIT:
if (buildInfo.usesAot) ...<String>[
'--aot',
'--tfa'
] else ...<String>[
'--no-link-platform',
'--split-output-by-packages',
'--manifest',
manifestPath
],
// debug, profile, jit release, release:
if (buildInfo.isDebug)
'--embed-sources'
else
'--no-embed-sources',
if (buildInfo.isProfile) ...<String>[
'-Ddart.vm.profile=true',
'-Ddart.vm.product=false',
],
if (buildInfo.mode.isRelease) ...<String>[
'-Ddart.vm.profile=false',
'-Ddart.vm.product=true',
],
'-Ddart.developer.causal_async_stacks=${buildInfo.isDebug}',
// Use bytecode and drop the ast in JIT release mode.
if (buildInfo.isJitRelease) ...<String>[
'--gen-bytecode',
'--drop-ast',
],
for (final String dartDefine in buildInfo.dartDefines)
'-D$dartDefine',
];
}
}

52
packages/flutter_tools/test/general.shard/fuchsia/fuchsia_kernel_compiler_test.dart Normal file
View File

@ -0,0 +1,52 @@
// Copyright 2014 The Flutter 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 'package:flutter_tools/src/build_info.dart';
import 'package:flutter_tools/src/fuchsia/fuchsia_kernel_compiler.dart';
import '../../src/common.dart';
void main() {
group('Fuchsia Kernel Compiler', () {
test('provide correct flags for release mode', () {
expect(
FuchsiaKernelCompiler.getBuildInfoFlags(
buildInfo: BuildInfo.release,
manifestPath: '',
),
allOf(<Matcher>[
contains('-Ddart.vm.profile=false'),
contains('-Ddart.vm.product=true'),
]));
});
test('provide correct flags for profile mode', () {
expect(
FuchsiaKernelCompiler.getBuildInfoFlags(
buildInfo: BuildInfo.profile,
manifestPath: '',
),
allOf(<Matcher>[
contains('-Ddart.vm.profile=true'),
contains('-Ddart.vm.product=false'),
]),
);
});
test('provide correct flags for custom dart define', () {
expect(
FuchsiaKernelCompiler.getBuildInfoFlags(
buildInfo: const BuildInfo(
BuildMode.debug,
null,
treeShakeIcons: true,
dartDefines: <String>['abc=efg'],
),
manifestPath: ''),
allOf(<Matcher>[
contains('-Dabc=efg'),
]));
});
});
}