Roll back 16364004 and 16206027.

sdk/lib/_internal/dartdoc/bin/dartdoc.dart

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 /**
  * To generate docs for a library, run this script with the path to an
  * entrypoint .dart file, like:
  *
  *     $ dart dartdoc.dart foo.dart
  *
@@ skipping 11 matching lines @@
 // TODO(rnystrom): Use "package:" URL (#4968).
 import '../lib/dartdoc.dart';
 import '../lib/src/dartdoc/utils.dart';
 import 'package:args/args.dart';
 import 'package:pathos/path.dart' as path;
 
 /**
  * Run this from the `lib/_internal/dartdoc` directory.
  */
 main() {
-  mainWithOptions(new Options());
-}
-
-/**
- * We use this to include dartdoc in a single snapshot with dart2js.
- * (They share 90% of the code)
- */
-mainWithOptions(Options options) {
   // Need this because ArgParser.getUsage doesn't show command invocation.
   final USAGE = 'Usage dartdoc [options] <entrypoint(s)>\n[options] include:';
 
-  final args = options.arguments;
+  final args = new Options().arguments;
 
   final dartdoc = new Dartdoc();
 
   final argParser = new ArgParser();
 
   Path libPath = scriptDir.append('../../../../');
 
   String packageRoot;
 
   argParser.addFlag('no-code',
@@ skipping 187 matching lines @@
   if (packageRoot == null) packageRoot = _getPackageRoot(entrypoints);
 
   cleanOutputDirectory(dartdoc.outputDir);
 
   // Start the analysis and documentation.
   dartdoc.documentLibraries(entrypoints, libPath, packageRoot)
     // Prepare the dart2js script code and copy static resources.
     // TODO(amouravski): move compileScript out and pre-generate the client
     // scripts. This takes a long time and the js hardly ever changes.
     .then((_) => compileScript(dartdoc.mode, dartdoc.outputDir, libPath))
-    .then((_) => copyDirectory(libPath.append('lib/_internal/dartdoc/static'),
-                               dartdoc.outputDir))
+    .then((_) => copyDirectory(scriptDir.append('../static'),
+          dartdoc.outputDir))
     .then((_) {
       print(dartdoc.status);
       if (dartdoc.totals == 0) {
         exit(1);
       }
     })
     .catchError((e) {
       print('Error: generation failed: ${e}');
       var trace = getAttachedStackTrace(e);
       if (trace != null) print("StackTrace: $trace");
@@ skipping 17 matching lines @@
   // If there is not, then check if the entrypoint is somewhere in a `lib`
   // directory.
   var parts = path.split(path.dirname(script));
   var libDir = parts.lastIndexOf('lib');
   if (libDir > 0) {
     return path.join(path.joinAll(parts.take(libDir)), 'packages');
   } else {
     return null;
   }
 }