| Index: sdk/lib/_internal/compiler/implementation/js_emitter/code_emitter_task.dart
|
| diff --git a/sdk/lib/_internal/compiler/implementation/js_emitter/code_emitter_task.dart b/sdk/lib/_internal/compiler/implementation/js_emitter/code_emitter_task.dart
|
| index 7113389e597380d4f76f9d82e59430ff10ccef80..56b6ce46c63ba60ab6d85ac1c1b21fc44384613c 100644
|
| --- a/sdk/lib/_internal/compiler/implementation/js_emitter/code_emitter_task.dart
|
| +++ b/sdk/lib/_internal/compiler/implementation/js_emitter/code_emitter_task.dart
|
| @@ -1299,10 +1299,17 @@ class CodeEmitterTask extends CompilerTask {
|
| }
|
|
|
| void writeLibraryDescriptors(LibraryElement library) {
|
| - var uri = library.canonicalUri;
|
| - if (uri.scheme == 'file' && compiler.outputUri != null) {
|
| - uri = relativize(compiler.outputUri, library.canonicalUri, false);
|
| + var uri = "";
|
| + if (!compiler.enableMinification || backend.mustRetainUris) {
|
| + uri = library.canonicalUri;
|
| + if (uri.scheme == 'file' && compiler.outputUri != null) {
|
| + uri = relativize(compiler.outputUri, library.canonicalUri, false);
|
| + }
|
| }
|
| + String libraryName =
|
| + (!compiler.enableMinification || backend.mustRetainLibraryNames) ?
|
| + library.getLibraryName() :
|
| + "";
|
| Map<OutputUnit, ClassBuilder> descriptors =
|
| elementDescriptors[library];
|
|
|
| @@ -1320,7 +1327,7 @@ class CodeEmitterTask extends CompilerTask {
|
| outputBuffers.putIfAbsent(outputUnit, () => new CodeBuffer());
|
| int sizeBefore = outputBuffer.length;
|
| outputBuffers[outputUnit]
|
| - ..write('["${library.getLibraryName()}",$_')
|
| + ..write('["$libraryName",$_')
|
| ..write('"${uri}",$_')
|
| ..write(metadata == null ? "" : jsAst.prettyPrint(metadata, compiler))
|
| ..write(',$_')
|
|
|