"Reverting 41571"

utils/apidoc/docgen.gyp

Index: utils/apidoc/docgen.gyp
diff --git a/utils/apidoc/docgen.gyp b/utils/apidoc/docgen.gyp
index 126e5496160618904e46deb2dc6660b25b133696..66a4fb60b9e27cac60013dca4a00874d1fa86675 100644
--- a/utils/apidoc/docgen.gyp
+++ b/utils/apidoc/docgen.gyp
@@ -15,7 +15,7 @@
   ],
   'targets': [
     {
-      'target_name': 'dartdocgen',
+      'target_name': 'docgen',
       'type': 'none',
       'dependencies': [
         '../../create_sdk.gyp:create_sdk_internal',
@@ -63,12 +63,8 @@
             '../../sdk/bin/dart.bat',
             '../../sdk/bin/dart2js',
             '../../sdk/bin/dart2js.bat',
-            # TODO(alanknight): The docgen name is deprecated in favour of
-            # dartdocgen, and should be removed eventually.
             '../../sdk/bin/docgen',
-            '../../sdk/bin/dartdocgen',
             '../../sdk/bin/docgen.bat',
-            '../../sdk/bin/dartdocgen.bat',
             '../../tools/only_in_release_mode.py',
             '<(PRODUCT_DIR)/dart-sdk/README',
             '<(SHARED_INTERMEDIATE_DIR)/pkg_files.stamp',
@@ -81,7 +77,7 @@
             '../../tools/only_in_release_mode.py',
             '<@(_outputs)',
             '--',
-            '<(PRODUCT_DIR)/dart-sdk/bin/dartdocgen<(script_suffix)',
+            '<(PRODUCT_DIR)/dart-sdk/bin/docgen<(script_suffix)',
             '--out=<(PRODUCT_DIR)/api_docs/docgen',
             '--include-sdk',
             '--no-include-dependent-packages',
@@ -94,7 +90,7 @@
             '--exclude-lib=try',
             '../../pkg'
           ],
-          'message': 'Running dartdocgen: <(_action)',
+          'message': 'Running docgen: <(_action)',
         },
       ],
     }