Commit 72effdd2 authored by Jason Simmons's avatar Jason Simmons Committed by GitHub

Roll the engine and update for new binary names (#9089)

parent 4c530d5e
61fc1d6e31ab11752ec13385bd08447021790071 bf698a1fe52e62d161c2aab351029670dc9b8651
...@@ -69,7 +69,7 @@ void main() { ...@@ -69,7 +69,7 @@ void main() {
await tester.pumpWidget( await tester.pumpWidget(
new Material(child: new AboutListTile()), new Material(child: new AboutListTile()),
); );
expect(find.text('About sky_shell'), findsOneWidget); expect(find.text('About flutter_tester'), findsOneWidget);
}); });
testWidgets('AboutListTile control test', (WidgetTester tester) async { testWidgets('AboutListTile control test', (WidgetTester tester) async {
......
...@@ -122,10 +122,10 @@ class FlutterPlugin implements Plugin<Project> { ...@@ -122,10 +122,10 @@ class FlutterPlugin implements Plugin<Project> {
project.tasks.create("flutterBuildX86Jar", Jar) { project.tasks.create("flutterBuildX86Jar", Jar) {
destinationDir flutterX86Jar.parentFile destinationDir flutterX86Jar.parentFile
archiveName flutterX86Jar.name archiveName flutterX86Jar.name
from("${flutterRoot}/bin/cache/artifacts/engine/android-x86/libsky_shell.so") { from("${flutterRoot}/bin/cache/artifacts/engine/android-x86/libflutter.so") {
into "lib/x86" into "lib/x86"
} }
from("${flutterRoot}/bin/cache/artifacts/engine/android-x64/libsky_shell.so") { from("${flutterRoot}/bin/cache/artifacts/engine/android-x64/libflutter.so") {
into "lib/x86_64" into "lib/x86_64"
} }
} }
......
...@@ -37,7 +37,7 @@ String _artifactToFileName(Artifact artifact) { ...@@ -37,7 +37,7 @@ String _artifactToFileName(Artifact artifact) {
case Artifact.genSnapshot: case Artifact.genSnapshot:
return 'gen_snapshot'; return 'gen_snapshot';
case Artifact.skyShell: case Artifact.skyShell:
return 'sky_shell'; return 'flutter_tester';
case Artifact.snapshotDart: case Artifact.snapshotDart:
return 'snapshot.dart'; return 'snapshot.dart';
case Artifact.flutterFramework: case Artifact.flutterFramework:
......
...@@ -362,7 +362,7 @@ class FlutterEngine { ...@@ -362,7 +362,7 @@ class FlutterEngine {
for (FileSystemEntity entity in dir.listSync()) { for (FileSystemEntity entity in dir.listSync()) {
if (entity is File) { if (entity is File) {
final String name = fs.path.basename(entity.path); final String name = fs.path.basename(entity.path);
if (name == 'sky_shell') if (name == 'flutter_tester')
os.makeExecutable(entity); os.makeExecutable(entity);
} }
} }
......
...@@ -38,7 +38,7 @@ void main() { ...@@ -38,7 +38,7 @@ void main() {
expect( expect(
artifacts.getArtifactPath(Artifact.skyShell), artifacts.getArtifactPath(Artifact.skyShell),
fs.path.join(tempDir.path, 'bin', 'cache', 'artifacts', 'engine', 'linux-x64', 'sky_shell') fs.path.join(tempDir.path, 'bin', 'cache', 'artifacts', 'engine', 'linux-x64', 'flutter_tester')
); );
}, overrides: <Type, Generator> { }, overrides: <Type, Generator> {
Cache: () => new Cache(rootOverride: tempDir), Cache: () => new Cache(rootOverride: tempDir),
...@@ -91,7 +91,7 @@ void main() { ...@@ -91,7 +91,7 @@ void main() {
expect( expect(
artifacts.getArtifactPath(Artifact.skyShell), artifacts.getArtifactPath(Artifact.skyShell),
fs.path.join(tempDir.path, 'out', 'android_debug_unopt', 'sky_shell') fs.path.join(tempDir.path, 'out', 'android_debug_unopt', 'flutter_tester')
); );
}, overrides: <Type, Generator> { }, overrides: <Type, Generator> {
Platform: () => new FakePlatform(operatingSystem: 'linux') Platform: () => new FakePlatform(operatingSystem: 'linux')
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment