Index: tools/patch_sdk.dart |
diff --git a/tools/patch_sdk.dart b/tools/patch_sdk.dart |
index e51e843fc9e54871d3999c2ef5b80726ec1bc942..b563ae02cefc58fd05931315e2c606c048dc7776 100644 |
--- a/tools/patch_sdk.dart |
+++ b/tools/patch_sdk.dart |
@@ -119,8 +119,12 @@ Future _main(List<String> argv) async { |
if (forVm) { |
await fasta.compilePlatform(outDirUri, platform, |
packages: packages, outlineOutput: outline); |
+ var base = path.fromUri(Platform.script); |
+ Uri sdkDir = |
Siggi Cherem (dart-lang)
2017/06/15 01:10:19
nit: rename to `repositoryDir`? `sdkDir` might be
sivachandra
2017/06/15 06:10:54
Done.
|
+ new Uri.directory(path.dirname(path.dirname(path.absolute(base)))); |
+ Uri vmserviceSdk = sdkDir.resolve('runtime/bin/vmservice_sdk/'); |
Siggi Cherem (dart-lang)
2017/06/15 01:10:19
I'd like to eventually get rid of the fake vmservi
sivachandra
2017/06/15 06:10:54
Added the TODO.
|
await fasta.compile([ |
Siggi Cherem (dart-lang)
2017/06/15 01:10:19
now that this is independent of building the patch
sivachandra
2017/06/15 06:10:54
I considered that approach but decided against it
|
- "--sdk=${outDirUri.toString()}", |
+ "--sdk=${vmserviceSdk.toString()}", |
Siggi Cherem (dart-lang)
2017/06/15 01:10:19
FYI - I happen to just land a CL that updates thes
sivachandra
2017/06/15 06:10:54
Done.
|
"--platform=${outline.toString()}", |
"--packages=${packages.toString()}", |
"dart:vmservice_io", |
@@ -203,14 +207,6 @@ _copyExtraVmLibraries(String sdkOut, Map<String, String> locations) { |
_writeSync(builtinLibraryOut, readInputFile(builtinLibraryIn)); |
locations[vmLibrary] = path.join(vmLibrary, '${vmLibrary}.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["vmservice_io"] = "vmservice_io/vmservice_io.dart"; |
- locations["_vmservice"] = "vmservice/vmservice.dart"; |
} |
_applyPatch(SdkLibrary library, String sdkLibIn, String patchIn, String sdkOut, |