Chromium Code Reviews| Index: tools/patch_sdk.dart |
| diff --git a/tools/patch_sdk.dart b/tools/patch_sdk.dart |
| index bd6654fc0a75f6559a333eac2f82d4e43e240dbb..088efb99d16180edf8553f0b67543d3e3123296c 100644 |
| --- a/tools/patch_sdk.dart |
| +++ b/tools/patch_sdk.dart |
| @@ -127,8 +127,14 @@ Future _main(List<String> argv) async { |
| packages: packages, |
| outlineOutput: outline, |
| backendTarget: forVm ? 'vm_fasta' : 'flutter_fasta'); |
| + var base = path.fromUri(Platform.script); |
| + Uri repositoryDir = |
| + new Uri.directory(path.dirname(path.dirname(path.absolute(base)))); |
| + Uri vmserviceSdk = repositoryDir.resolve('runtime/bin/vmservice_sdk/'); |
|
Siggi Cherem (dart-lang)
2017/06/15 17:43:39
Sorry I didn't notice this earlier, I just realize
sivachandra
2017/06/15 18:34:21
How is it in patch set 3?
|
| + // TODO(sigmundch): Specify libraries.json directly instead of "--sdk" |
| + // after #29882 is fixed. |
| await fasta.compile([ |
| - "--sdk=$outDirUri", |
| + "--sdk=$vmserviceSdk", |
| "--platform=$outline", |
| "--target=$targetName", |
| "--packages=$packages", |
| @@ -243,16 +249,6 @@ _copyExtraLibraries(String sdkOut, Map<String, String> locations) { |
| _writeSync(builtinLibraryOut, readInputFile(builtinLibraryIn)); |
| locations['_builtin'] = path.join('_builtin', '_builtin.dart'); |
| - for (var file in ['loader.dart', 'server.dart', 'vmservice_io.dart']) { |
| - var libraryIn = path.join(dartDir, 'runtime', 'bin', 'vmservice', file); |
| - var libraryOut = path.join(sdkOut, 'vmservice_io', file); |
| - _writeSync(libraryOut, readInputFile(libraryIn)); |
| - } |
| - |
| - locations[forVm ? "vmservice_io" : "vmservice_sky"] = |
| - path.join('vmservice_io', 'vmservice_io.dart'); |
| - locations["_vmservice"] = path.join('vmservice', 'vmservice.dart'); |
| - |
| if (forFlutter) { |
| // Flutter repo has this layout: |
| // engine/src/ |