Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(194)

Unified Diff: pkg/compiler/lib/src/library_loader.dart

Issue 1388523002: dart2js: add support for configuration-specific imports. (Closed) Base URL: git@github.com:dart-lang/sdk.git@master
Patch Set: Update and fix status files. Implement missing functions. Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « pkg/compiler/lib/src/dart2js.dart ('k') | pkg/compiler/lib/src/parser/class_element_parser.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: pkg/compiler/lib/src/library_loader.dart
diff --git a/pkg/compiler/lib/src/library_loader.dart b/pkg/compiler/lib/src/library_loader.dart
index f0b296b1581b9663c8886a416fb63127667a9264..6006bc93b4d19971920fd2adcc0ac0f19f98ca01 100644
--- a/pkg/compiler/lib/src/library_loader.dart
+++ b/pkg/compiler/lib/src/library_loader.dart
@@ -384,7 +384,21 @@ class _LibraryLoaderTask extends CompilerTask implements LibraryLoaderTask {
return reporter.withCurrentElement(library, () {
Uri computeUri(LibraryDependency node) {
- String tagUriString = node.uri.dartString.slowToString();
+ StringNode uriNode = node.uri;
+ if (node.conditionalUris != null) {
+ for (ConditionalUri conditionalUri in node.conditionalUris) {
+ String key = conditionalUri.key.slowNameString;
+ String value = conditionalUri.value == null
+ ? "true"
+ : conditionalUri.value.dartString.slowToString();
+ String actual = compiler.fromEnvironment(key);
+ if (value == actual) {
+ uriNode = conditionalUri.uri;
+ break;
+ }
+ }
+ }
+ String tagUriString = uriNode.dartString.slowToString();
try {
return Uri.parse(tagUriString);
} on FormatException {
« no previous file with comments | « pkg/compiler/lib/src/dart2js.dart ('k') | pkg/compiler/lib/src/parser/class_element_parser.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698