Roll back 16364004 and 16206027.

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

Index: sdk/lib/_internal/dartdoc/bin/dartdoc.dart
diff --git a/sdk/lib/_internal/dartdoc/bin/dartdoc.dart b/sdk/lib/_internal/dartdoc/bin/dartdoc.dart
index dd81d07688d2e0f30392ada3654b759a37dce98b..d9fe3d9024527c7ba62191e6e650ab45227a0896 100644
--- a/sdk/lib/_internal/dartdoc/bin/dartdoc.dart
+++ b/sdk/lib/_internal/dartdoc/bin/dartdoc.dart
@@ -29,18 +29,10 @@ 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();
 
@@ -248,8 +240,8 @@ mainWithOptions(Options options) {
     // 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) {