Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in
Toggle navigation
F
Front-End
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
abdullh.alsoleman
Front-End
Commits
db901ce5
Unverified
Commit
db901ce5
authored
Feb 06, 2020
by
Jonah Williams
Committed by
GitHub
Feb 06, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[flutter_tools] remove dependencies checks that are no longer relevant in assemble-land (#50225)
parent
69ecca55
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
46 deletions
+1
-46
build.dart
packages/flutter_tools/lib/src/base/build.dart
+0
-33
dart_test.dart
...ls/test/general.shard/build_system/targets/dart_test.dart
+1
-13
No files found.
packages/flutter_tools/lib/src/base/build.dart
View file @
db901ce5
...
@@ -10,7 +10,6 @@ import '../artifacts.dart';
...
@@ -10,7 +10,6 @@ import '../artifacts.dart';
import
'../build_info.dart'
;
import
'../build_info.dart'
;
import
'../bundle.dart'
;
import
'../bundle.dart'
;
import
'../compile.dart'
;
import
'../compile.dart'
;
import
'../dart/package_map.dart'
;
import
'../globals.dart'
as
globals
;
import
'../globals.dart'
as
globals
;
import
'../macos/xcode.dart'
;
import
'../macos/xcode.dart'
;
import
'../project.dart'
;
import
'../project.dart'
;
...
@@ -109,22 +108,9 @@ class AOTSnapshotter {
...
@@ -109,22 +108,9 @@ class AOTSnapshotter {
// TODO(cbracken): replace IOSArch with TargetPlatform.ios_{armv7,arm64}.
// TODO(cbracken): replace IOSArch with TargetPlatform.ios_{armv7,arm64}.
assert
(
platform
!=
TargetPlatform
.
ios
||
darwinArch
!=
null
);
assert
(
platform
!=
TargetPlatform
.
ios
||
darwinArch
!=
null
);
final
PackageMap
packageMap
=
PackageMap
(
packagesPath
);
final
String
packageMapError
=
packageMap
.
checkValid
();
if
(
packageMapError
!=
null
)
{
globals
.
printError
(
packageMapError
);
return
1
;
}
final
Directory
outputDir
=
globals
.
fs
.
directory
(
outputPath
);
final
Directory
outputDir
=
globals
.
fs
.
directory
(
outputPath
);
outputDir
.
createSync
(
recursive:
true
);
outputDir
.
createSync
(
recursive:
true
);
final
String
skyEnginePkg
=
_getPackagePath
(
packageMap
,
'sky_engine'
);
final
String
uiPath
=
globals
.
fs
.
path
.
join
(
skyEnginePkg
,
'lib'
,
'ui'
,
'ui.dart'
);
final
String
vmServicePath
=
globals
.
fs
.
path
.
join
(
skyEnginePkg
,
'sdk_ext'
,
'vmservice_io.dart'
);
final
List
<
String
>
inputPaths
=
<
String
>[
uiPath
,
vmServicePath
,
mainPath
];
final
Set
<
String
>
outputPaths
=
<
String
>{};
final
List
<
String
>
genSnapshotArgs
=
<
String
>[
final
List
<
String
>
genSnapshotArgs
=
<
String
>[
'--deterministic'
,
'--deterministic'
,
];
];
...
@@ -136,13 +122,11 @@ class AOTSnapshotter {
...
@@ -136,13 +122,11 @@ class AOTSnapshotter {
final
String
assembly
=
globals
.
fs
.
path
.
join
(
outputDir
.
path
,
'snapshot_assembly.S'
);
final
String
assembly
=
globals
.
fs
.
path
.
join
(
outputDir
.
path
,
'snapshot_assembly.S'
);
if
(
platform
==
TargetPlatform
.
ios
||
platform
==
TargetPlatform
.
darwin_x64
)
{
if
(
platform
==
TargetPlatform
.
ios
||
platform
==
TargetPlatform
.
darwin_x64
)
{
// Assembly AOT snapshot.
// Assembly AOT snapshot.
outputPaths
.
add
(
assembly
);
genSnapshotArgs
.
add
(
'--snapshot_kind=app-aot-assembly'
);
genSnapshotArgs
.
add
(
'--snapshot_kind=app-aot-assembly'
);
genSnapshotArgs
.
add
(
'--assembly=
$assembly
'
);
genSnapshotArgs
.
add
(
'--assembly=
$assembly
'
);
genSnapshotArgs
.
add
(
'--strip'
);
genSnapshotArgs
.
add
(
'--strip'
);
}
else
{
}
else
{
final
String
aotSharedLibrary
=
globals
.
fs
.
path
.
join
(
outputDir
.
path
,
'app.so'
);
final
String
aotSharedLibrary
=
globals
.
fs
.
path
.
join
(
outputDir
.
path
,
'app.so'
);
outputPaths
.
add
(
aotSharedLibrary
);
genSnapshotArgs
.
add
(
'--snapshot_kind=app-aot-elf'
);
genSnapshotArgs
.
add
(
'--snapshot_kind=app-aot-elf'
);
genSnapshotArgs
.
add
(
'--elf=
$aotSharedLibrary
'
);
genSnapshotArgs
.
add
(
'--elf=
$aotSharedLibrary
'
);
genSnapshotArgs
.
add
(
'--strip'
);
genSnapshotArgs
.
add
(
'--strip'
);
...
@@ -181,13 +165,6 @@ class AOTSnapshotter {
...
@@ -181,13 +165,6 @@ class AOTSnapshotter {
genSnapshotArgs
.
add
(
mainPath
);
genSnapshotArgs
.
add
(
mainPath
);
// TODO(jonahwilliams): fully remove input checks once all callers are
// using assemble.
final
Iterable
<
String
>
missingInputs
=
inputPaths
.
where
((
String
p
)
=>
!
globals
.
fs
.
isFileSync
(
p
));
if
(
missingInputs
.
isNotEmpty
)
{
globals
.
printTrace
(
'Missing input files:
$missingInputs
from
$inputPaths
'
);
}
final
SnapshotType
snapshotType
=
SnapshotType
(
platform
,
buildMode
);
final
SnapshotType
snapshotType
=
SnapshotType
(
platform
,
buildMode
);
final
int
genSnapshotExitCode
=
final
int
genSnapshotExitCode
=
await
_timedStep
(
'snapshot(CompileTime)'
,
'aot-snapshot'
,
await
_timedStep
(
'snapshot(CompileTime)'
,
'aot-snapshot'
,
...
@@ -201,12 +178,6 @@ class AOTSnapshotter {
...
@@ -201,12 +178,6 @@ class AOTSnapshotter {
return
genSnapshotExitCode
;
return
genSnapshotExitCode
;
}
}
// Write path to gen_snapshot, since snapshots have to be re-generated when we roll
// the Dart SDK.
// TODO(jonahwilliams): remove when all callers are using assemble.
final
String
genSnapshotPath
=
GenSnapshot
.
getSnapshotterPath
(
snapshotType
);
outputDir
.
childFile
(
'gen_snapshot.d'
).
writeAsStringSync
(
'gen_snapshot.d:
$genSnapshotPath
\n
'
);
// On iOS and macOS, we use Xcode to compile the snapshot into a dynamic library that the
// On iOS and macOS, we use Xcode to compile the snapshot into a dynamic library that the
// end-developer can link into their app.
// end-developer can link into their app.
if
(
platform
==
TargetPlatform
.
ios
||
platform
==
TargetPlatform
.
darwin_x64
)
{
if
(
platform
==
TargetPlatform
.
ios
||
platform
==
TargetPlatform
.
darwin_x64
)
{
...
@@ -354,10 +325,6 @@ class AOTSnapshotter {
...
@@ -354,10 +325,6 @@ class AOTSnapshotter {
].
contains
(
platform
);
].
contains
(
platform
);
}
}
String
_getPackagePath
(
PackageMap
packageMap
,
String
package
)
{
return
globals
.
fs
.
path
.
dirname
(
globals
.
fs
.
path
.
fromUri
(
packageMap
.
map
[
package
]));
}
/// This method is used to measure duration of an action and emit it into
/// This method is used to measure duration of an action and emit it into
/// verbose output from flutter_tool for other tools (e.g. benchmark runner)
/// verbose output from flutter_tool for other tools (e.g. benchmark runner)
/// to find.
/// to find.
...
...
packages/flutter_tools/test/general.shard/build_system/targets/dart_test.dart
View file @
db901ce5
...
@@ -63,22 +63,10 @@ void main() {
...
@@ -63,22 +63,10 @@ void main() {
}
else
{
}
else
{
assert
(
false
);
assert
(
false
);
}
}
final
String
skyEngineLine
=
globals
.
platform
.
isWindows
?
r'sky_engine:file:///C:/bin/cache/pkg/sky_engine/lib/'
:
'sky_engine:file:///bin/cache/pkg/sky_engine/lib/'
;
globals
.
fs
.
file
(
'.packages'
)
..
createSync
()
..
writeAsStringSync
(
'''
# Generated
$skyEngineLine
flutter_tools:lib/'''
);
final
String
engineArtifacts
=
globals
.
fs
.
path
.
join
(
'bin'
,
'cache'
,
final
String
engineArtifacts
=
globals
.
fs
.
path
.
join
(
'bin'
,
'cache'
,
'artifacts'
,
'engine'
);
'artifacts'
,
'engine'
);
final
List
<
String
>
paths
=
<
String
>[
final
List
<
String
>
paths
=
<
String
>[
globals
.
fs
.
path
.
join
(
'bin'
,
'cache'
,
'pkg'
,
'sky_engine'
,
'lib'
,
'ui'
,
'ui.dart'
),
globals
.
fs
.
path
.
join
(
'bin'
,
'cache'
,
'pkg'
,
'sky_engine'
,
'sdk_ext'
,
'vmservice_io.dart'
),
globals
.
fs
.
path
.
join
(
'bin'
,
'cache'
,
'dart-sdk'
,
'bin'
,
'dart'
),
globals
.
fs
.
path
.
join
(
'bin'
,
'cache'
,
'dart-sdk'
,
'bin'
,
'dart'
),
globals
.
fs
.
path
.
join
(
'bin'
,
'cache'
,
'dart-sdk'
,
'bin'
,
'dart.exe'
),
globals
.
fs
.
path
.
join
(
'bin'
,
'cache'
,
'dart-sdk'
,
'bin'
,
'dart.exe'
),
globals
.
fs
.
path
.
join
(
engineArtifacts
,
getNameForHostPlatform
(
hostPlatform
),
globals
.
fs
.
path
.
join
(
engineArtifacts
,
getNameForHostPlatform
(
hostPlatform
),
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment