Add support for building the Dart VM for Android OS.

runtime/bin/bin.gypi

Index: runtime/bin/bin.gypi
diff --git a/runtime/bin/bin.gypi b/runtime/bin/bin.gypi
index e168bfb0463759b0b2ff38c6b4d234d475cfa042..1400cc0798f65368ebf1ee2b41e6c68eb4881db8 100644
--- a/runtime/bin/bin.gypi
+++ b/runtime/bin/bin.gypi
@@ -45,7 +45,7 @@
           ],
           'message': 'Generating ''<(builtin_cc_file)'' file.'
         },
-      ]
+      ],
     },
     {
       'target_name': 'generate_crypto_cc_file',
@@ -75,7 +75,7 @@
           ],
           'message': 'Generating ''<(crypto_cc_file)'' file.'
         },
-      ]
+      ],
     },
     {
       'target_name': 'generate_io_cc_file',
@@ -105,7 +105,7 @@
           ],
           'message': 'Generating ''<(io_cc_file)'' file.'
         },
-      ]
+      ],
     },
     {
       'target_name': 'generate_json_cc_file',
@@ -135,7 +135,7 @@
           ],
           'message': 'Generating ''<(json_cc_file)'' file.'
         },
-      ]
+      ],
     },
     {
       'target_name': 'generate_uri_cc_file',
@@ -184,7 +184,7 @@
           ],
           'message': 'Generating ''<(uri_cc_file)'' file.'
         },
-      ]
+      ],
     },
     {
       'target_name': 'generate_utf_cc_file',
@@ -214,7 +214,7 @@
           ],
           'message': 'Generating ''<(utf_cc_file)'' file.'
         },
-      ]
+      ],
     },
     {
       'target_name': 'generate_web_cc_file',
@@ -244,7 +244,7 @@
           ],
           'message': 'Generating ''<(web_cc_file)'' file.'
         },
-      ]
+      ],
     },
     {
       'target_name': 'libdart_builtin',
@@ -346,22 +346,51 @@
           'link_settings': {
             'libraries': [ '-lws2_32.lib', '-lRpcrt4.lib' ],
           },
-       }]],
+       }],
+       ],
+    },
+    {
+      # Generate snapshot bin file.
+      'target_name': 'generate_snapshot_bin',
+      'type': 'none',
+      'dependencies': [
+        'gen_snapshot',
+      ],
+      'actions': [
+        {
+          'action_name': 'generate_snapshot_bin',
+          'inputs': [
+            '../tools/create_snapshot_bin.py',
+            '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)gen_snapshot<(EXECUTABLE_SUFFIX)',
+          ],
+          'outputs': [
+            '<(snapshot_bin_file)',
+          ],
+          'action': [
+            'python',
+            'tools/create_snapshot_bin.py',
+            '--executable', '<(PRODUCT_DIR)/gen_snapshot',
+            '--output_bin', '<(snapshot_bin_file)',
+            '--target_os', '<(OS)'
+          ],
+          'message': 'Generating ''<(snapshot_bin_file)'' file.'
+        },
+      ],
     },
     {
       # Generate snapshot file.
       'target_name': 'generate_snapshot_file',
       'type': 'none',
       'dependencies': [
-        'gen_snapshot',
+        'generate_snapshot_bin',
       ],
       'actions': [
         {
           'action_name': 'generate_snapshot_file',
           'inputs': [
             '../tools/create_snapshot_file.py',
-            '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)gen_snapshot<(EXECUTABLE_SUFFIX)',
             '<(snapshot_in_cc_file)',
+            '<(snapshot_bin_file)'
           ],
           'outputs': [
             '<(snapshot_cc_file)',
@@ -369,14 +398,13 @@
           'action': [
             'python',
             'tools/create_snapshot_file.py',
-            '--executable', '<(PRODUCT_DIR)/gen_snapshot',
-            '--output_bin', '<(snapshot_bin_file)',
+            '--input_bin', '<(snapshot_bin_file)',
             '--input_cc', '<(snapshot_in_cc_file)',
             '--output', '<(snapshot_cc_file)',
           ],
           'message': 'Generating ''<(snapshot_cc_file)'' file.'
         },
-      ]
+      ],
     },
     {
       # dart binary with a snapshot of corelibs built in.
@@ -408,7 +436,7 @@
               'AdditionalOptions': [ '/EXPORT:Dart_True' ],
             },
           },
-        }],
+        }]
        ],
     },
     {
@@ -447,7 +475,14 @@
       'type': 'executable',
       'sources': [
         'process_test.cc',
-      ]
+      ],
+      'conditions': [
+          ['dart_want_separate_host_toolset==1', {
+            'toolsets': ['host'],
+          }, {
+            'toolsets': ['target'],
+          }]
+      ],
     },
     {
       'target_name': 'run_vm_tests',
@@ -495,6 +530,11 @@
             'libraries': [ '-lws2_32.lib', '-lRpcrt4.lib' ],
           },
         }],
+        ['dart_want_separate_host_toolset==1', {
+              'toolsets': ['host'],
+            }, {
+              'toolsets': ['target'],
+            }],
       ],
     },
     {
@@ -527,6 +567,11 @@
             'OTHER_LDFLAGS': [ '-undefined', 'dynamic_lookup' ],
           },
         }],
+        ['dart_want_separate_host_toolset==1', {
+              'toolsets': ['host'],
+            }, {
+              'toolsets': ['target'],
+            }],
       ],
     },
   ],