Commit 2ce57eb3 authored by Adam Barth's avatar Adam Barth Committed by GitHub

Fix paths again (#4589)

I got confused about the sdk_ext directory.
parent fc77bfe6
......@@ -73,7 +73,7 @@ class BuildAotCommand extends FlutterCommand {
String _getSdkExtensionPath(String packagesPath, String package) {
Directory packageDir = new Directory(path.join(packagesPath, package));
return path.join(path.dirname(packageDir.resolveSymbolicLinksSync()), 'sdk_ext');
return path.dirname(packageDir.resolveSymbolicLinksSync());
}
/// Build an AOT snapshot. Return `null` (and log to `printError`) if the method
......@@ -166,13 +166,13 @@ Future<String> _buildAotSnapshot(
return null;
}
String mojoSdkExt = _getSdkExtensionPath(packagesPath, 'mojo');
String mojoInternalPath = path.join(mojoSdkExt, 'internal.dart');
String mojoPkg = _getSdkExtensionPath(packagesPath, 'mojo');
String mojoInternalPath = path.join(mojoPkg, 'sdk_ext', 'internal.dart');
String skyEnginePkg = _getSdkExtensionPath(packagesPath, 'sky_engine');
String uiPath = path.join(skyEnginePkg, 'dart_ui', 'dart_ui.dart');
String uiPath = path.join(skyEnginePkg, 'dart_ui', 'ui.dart');
String jniPath = path.join(skyEnginePkg, 'dart_jni', 'jni.dart');
String vmServicePath = path.join(skyEnginePkg, 'dart', 'runtime', 'bin', 'vmservice', 'vmservice_io.dart');
String vmServicePath = path.join(skyEnginePkg, 'sdk_ext', 'dart', 'runtime', 'bin', 'vmservice', 'vmservice_io.dart');
List<String> filePaths = <String>[
genSnapshot,
......
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