Support both new and old style package layouts.

utils/pub/pub.dart

Index: utils/pub/pub.dart
diff --git a/utils/pub/pub.dart b/utils/pub/pub.dart
index 8bc3b70709995658798d72868224de6924594faa..795faf5e8ab74df00685502381a0e6a9a265cf82 100644
--- a/utils/pub/pub.dart
+++ b/utils/pub/pub.dart
@@ -52,7 +52,6 @@ ArgParser get pubArgParser {
   parser.addFlag('version', negatable: false,
     help: 'Prints the version of Pub');
   parser.addFlag('trace', help: 'Prints a stack trace when an error occurs');
-  parser.addFlag('self-link', help: 'Temporary flag, do not use.');
   return parser;
 }
 
@@ -75,12 +74,6 @@ main() {
     return;
   }
 
-  // TODO(rnystrom): Get rid of this flag (and make the default be true) when
-  // #4820 is fixed and the Editor can handle recursive symlinks.
-  if (globalOptions['self-link']) {
-    Entrypoint.installSelfLink = true;
-  }
-
   // TODO(nweiz): Have a fallback for this this out automatically once 1145 is
   // fixed.
   var sdkDir = Platform.environment['DART_SDK'];