From eb475bbb80a72db591952cf8a086ffd058f31514 Mon Sep 17 00:00:00 2001 From: Jason Simmons Date: Fri, 20 Oct 2017 15:32:27 -0700 Subject: [PATCH] move dart_io_entries.txt to third_party/dart for AOT builds with a local engine (#12659) --- packages/flutter_tools/lib/src/artifacts.dart | 2 +- packages/flutter_tools/test/artifacts_test.dart | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/flutter_tools/lib/src/artifacts.dart b/packages/flutter_tools/lib/src/artifacts.dart index c6afb1ae283..25f82cfa4e7 100644 --- a/packages/flutter_tools/lib/src/artifacts.dart +++ b/packages/flutter_tools/lib/src/artifacts.dart @@ -229,7 +229,7 @@ class LocalEngineArtifacts extends Artifacts { String getArtifactPath(Artifact artifact, [TargetPlatform platform, BuildMode mode]) { switch (artifact) { case Artifact.dartIoEntriesTxt: - return fs.path.join(_engineSrcPath, 'dart', 'runtime', 'bin', _artifactToFileName(artifact)); + return fs.path.join(_engineSrcPath, 'third_party', 'dart', 'runtime', 'bin', _artifactToFileName(artifact)); case Artifact.dartVmEntryPointsTxt: return fs.path.join(_engineSrcPath, 'flutter', 'runtime', _artifactToFileName(artifact)); case Artifact.snapshotDart: diff --git a/packages/flutter_tools/test/artifacts_test.dart b/packages/flutter_tools/test/artifacts_test.dart index f1a7ddd3964..c4faf25bec3 100644 --- a/packages/flutter_tools/test/artifacts_test.dart +++ b/packages/flutter_tools/test/artifacts_test.dart @@ -79,7 +79,7 @@ void main() { testUsingContext('getArtifactPath', () { expect( artifacts.getArtifactPath(Artifact.dartIoEntriesTxt, TargetPlatform.android_arm, BuildMode.debug), - fs.path.join(tempDir.path, 'dart', 'runtime', 'bin', 'dart_io_entries.txt') + fs.path.join(tempDir.path, 'third_party', 'dart', 'runtime', 'bin', 'dart_io_entries.txt') ); expect( artifacts.getArtifactPath(Artifact.flutterFramework, TargetPlatform.ios, BuildMode.release),