Reland 30137 - Fix version generation for dart2js

utils/compiler/compiler.gyp

Index: utils/compiler/compiler.gyp
===================================================================
--- utils/compiler/compiler.gyp	(revision 30141)
+++ utils/compiler/compiler.gyp	(working copy)
@@ -16,39 +16,17 @@
       ],
       'actions': [
         {
-          'action_name': 'generate_dart2js_snapshot',
+          'action_name': 'generate_snapshots',
           'inputs': [
             '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)dart<(EXECUTABLE_SUFFIX)',
             '../../sdk/lib/_internal/libraries.dart',
-            '<!@(["python", "../../tools/list_files.py", "\\.dart$",'
-            ' "../../sdk/lib/_internal/compiler", "../../runtime/lib"])',
-            '../../sdk/lib/_internal/libraries.dart',
-          ],
-          'outputs': [
-            '<(SHARED_INTERMEDIATE_DIR)/dart2js.dart.snapshot',
-          ],
-          'action': [
-            '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)dart<(EXECUTABLE_SUFFIX)',
-            # Note: we don't store the snapshot in the location where
-            # the dart2js script is looking for it.  The motivation
-            # for that is to support an incremental development model
-            # for dart2js compiler engineers.  However, we install the
-            # snapshot in the proper location when building the SDK.
-            '--snapshot=<(SHARED_INTERMEDIATE_DIR)/dart2js.dart.snapshot',
-            '../../sdk/lib/_internal/compiler/implementation/dart2js.dart',
-          ],
-        },
-        {
-          'action_name': 'generate_dartdoc_snapshot',
-          'inputs': [
-            '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)dart<(EXECUTABLE_SUFFIX)',
-            '../../sdk/lib/_internal/libraries.dart',
             '<!@(["python", "../../tools/list_files.py", "\\.dart$", "../../sdk/lib/_internal/compiler", "../../runtime/lib", "../../sdk/lib/_internal/dartdoc"])',
             'create_snapshot.dart',
             '<(SHARED_INTERMEDIATE_DIR)/packages.stamp',
           ],
           'outputs': [
             '<(SHARED_INTERMEDIATE_DIR)/utils_wrapper.dart.snapshot',
+            '<(SHARED_INTERMEDIATE_DIR)/dart2js.dart.snapshot',
           ],
           'action': [
             '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)dart<(EXECUTABLE_SUFFIX)',