Add support for building the Dart VM for Android OS.

runtime/bin/bin.gypi

 # 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.
 
 {
   'variables': {
     'crypto_cc_file': '<(SHARED_INTERMEDIATE_DIR)/crypto_gen.cc',
     'io_cc_file': '<(SHARED_INTERMEDIATE_DIR)/io_gen.cc',
     'json_cc_file': '<(SHARED_INTERMEDIATE_DIR)/json_gen.cc',
     'uri_cc_file': '<(SHARED_INTERMEDIATE_DIR)/uri_gen.cc',
@@ skipping 27 matching lines @@
             'python',
             'tools/create_string_literal.py',
             '--output', '<(builtin_cc_file)',
             '--input_cc', '<(builtin_in_cc_file)',
             '--include', 'bin/builtin.h',
             '--var_name', 'Builtin::builtin_source_',
             '<@(_sources)',
           ],
           'message': 'Generating ''<(builtin_cc_file)'' file.'
         },
-      ]
+      ],

[ahe, 2012/08/08 19:09:58]

While I appreciate the consistency, I'd like to keep formatting clean-up out of
otherwise complicated changes like this.

[jackpal, 2012/08/09 01:09:48]

Done.

     },
     {
       'target_name': 'generate_crypto_cc_file',
       'type': 'none',
       'includes': [
         'crypto_sources.gypi',
       ],
       'actions': [
         {
           'action_name': 'generate_crypto_cc',
           'inputs': [
             '../tools/create_string_literal.py',
             '<(builtin_in_cc_file)',
             '<@(_sources)',
           ],
           'outputs': [
             '<(crypto_cc_file)',
           ],
           'action': [
             'python',
             'tools/create_string_literal.py',
             '--output', '<(crypto_cc_file)',
             '--input_cc', '<(builtin_in_cc_file)',
             '--include', 'bin/builtin.h',
             '--var_name', 'Builtin::crypto_source_',
             '<@(_sources)',
           ],
           'message': 'Generating ''<(crypto_cc_file)'' file.'
         },
-      ]
+      ],
     },
     {
       'target_name': 'generate_io_cc_file',
       'type': 'none',
       'includes': [
         'io_sources.gypi',
       ],
       'actions': [
         {
           'action_name': 'generate_io_cc',
           'inputs': [
             '../tools/create_string_literal.py',
             '<(builtin_in_cc_file)',
             '<@(_sources)',
           ],
           'outputs': [
             '<(io_cc_file)',
           ],
           'action': [
             'python',
             'tools/create_string_literal.py',
             '--output', '<(io_cc_file)',
             '--input_cc', '<(builtin_in_cc_file)',
             '--include', 'bin/builtin.h',
             '--var_name', 'Builtin::io_source_',
             '<@(_sources)',
           ],
           'message': 'Generating ''<(io_cc_file)'' file.'
         },
-      ]
+      ],
     },
     {
       'target_name': 'generate_json_cc_file',
       'type': 'none',
       'includes': [
         'json_sources.gypi',
       ],
       'actions': [
         {
           'action_name': 'generate_json_cc',
           'inputs': [
             '../tools/create_string_literal.py',
             '<(builtin_in_cc_file)',
             '<@(_sources)',
           ],
           'outputs': [
             '<(json_cc_file)',
           ],
           'action': [
             'python',
             'tools/create_string_literal.py',
             '--output', '<(json_cc_file)',
             '--input_cc', '<(builtin_in_cc_file)',
             '--include', 'bin/builtin.h',
             '--var_name', 'Builtin::json_source_',
             '<@(_sources)',
           ],
           'message': 'Generating ''<(json_cc_file)'' file.'
         },
-      ]
+      ],
     },
     {
       'target_name': 'generate_uri_cc_file',
       'type': 'none',
       'includes': [
         'uri_sources.gypi',
       ],
       'variables': {
         'uri_dart': '<(SHARED_INTERMEDIATE_DIR)/uri.dart',
       },
@@ skipping 28 matching lines @@
             'python',
             'tools/create_string_literal.py',
             '--output', '<(uri_cc_file)',
             '--input_cc', '<(builtin_in_cc_file)',
             '--include', 'bin/builtin.h',
             '--var_name', 'Builtin::uri_source_',
             '<(uri_dart)',
           ],
           'message': 'Generating ''<(uri_cc_file)'' file.'
         },
-      ]
+      ],
     },
     {
       'target_name': 'generate_utf_cc_file',
       'type': 'none',
       'includes': [
         'utf_sources.gypi',
       ],
       'actions': [
         {
           'action_name': 'generate_utf_cc',
           'inputs': [
             '../tools/create_string_literal.py',
             '<(builtin_in_cc_file)',
             '<@(_sources)',
           ],
           'outputs': [
             '<(utf_cc_file)',
           ],
           'action': [
             'python',
             'tools/create_string_literal.py',
             '--output', '<(utf_cc_file)',
             '--input_cc', '<(builtin_in_cc_file)',
             '--include', 'bin/builtin.h',
             '--var_name', 'Builtin::utf_source_',
             '<@(_sources)',
           ],
           'message': 'Generating ''<(utf_cc_file)'' file.'
         },
-      ]
+      ],
     },
     {
       'target_name': 'generate_web_cc_file',
       'type': 'none',
       'includes': [
         'web_sources.gypi',
       ],
       'actions': [
         {
           'action_name': 'generate_web_cc',
           'inputs': [
             '../tools/create_string_literal.py',
             '<(builtin_in_cc_file)',
             '<@(_sources)',
           ],
           'outputs': [
             '<(web_cc_file)',
           ],
           'action': [
             'python',
             'tools/create_string_literal.py',
             '--output', '<(web_cc_file)',
             '--input_cc', '<(builtin_in_cc_file)',
             '--include', 'bin/builtin.h',
             '--var_name', 'Builtin::web_source_',
             '<@(_sources)',
           ],
           'message': 'Generating ''<(web_cc_file)'' file.'
         },
-      ]
+      ],
     },
     {
       'target_name': 'libdart_builtin',
       'type': 'static_library',
       'dependencies': [
         'generate_builtin_cc_file',
         'generate_crypto_cc_file',
         'generate_io_cc_file',
         'generate_json_cc_file',
         'generate_uri_cc_file',
@@ skipping 81 matching lines @@
         '<(json_cc_file)',
         '<(uri_cc_file)',
         '<(utf_cc_file)',
         '<(web_cc_file)',
       ],
       'conditions': [
         ['OS=="win"', {
           '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',

[ahe, 2012/08/08 19:09:58]

Why is there a .. here?

[jackpal, 2012/08/09 01:09:48]

Experimenting with variations shows that .. is definitely needed for the input,
and not allowed for the action.

It seems that inputs are relative to the gypi file, but actions are relative to
directory you run gyp from.

For what it is worth, this inconsistency is not something my change introduced;
the old code for gen_snapshot did the same thing.

+            '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)gen_snapshot<(EXECUTABLE_SUFFIX)',
+          ],
+          'outputs': [
+            '<(snapshot_bin_file)',
+          ],
+          'action': [
+            'python',
+            'tools/create_snapshot_bin.py',

[ahe, 2012/08/08 19:09:58]

And not here?

[jackpal, 2012/08/09 01:09:48]

See above.

+            '--executable', '<(PRODUCT_DIR)/gen_snapshot',

[ahe, 2012/08/08 19:09:58]

This doesn't correspond to the value in inputs.

[jackpal, 2012/08/09 01:09:48]

See above.

+            '--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)',
           ],
           '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.
       'target_name': 'dart',
       'type': 'executable',
       'dependencies': [
         'libdart_export',
         'libdart_builtin',
         'generate_snapshot_file',
       ],
@@ skipping 11 matching lines @@
           'link_settings': {
             'libraries': [ '-lws2_32.lib', '-lRpcrt4.lib' ],
           },
           # Generate an import library on Windows, by exporting a function.
           # Extensions use this import library to link to the API in dart.exe.
           'msvs_settings': {
             'VCLinkerTool': {
               'AdditionalOptions': [ '/EXPORT:Dart_True' ],
             },
           },
-        }],
+        }]
        ],
     },
     {
       # dart binary without any snapshot built in.
       'target_name': 'dart_no_snapshot',
       'type': 'executable',
       'dependencies': [
         'libdart_withcore',
         'libdart_builtin',
       ],
@@ skipping 18 matching lines @@
           'link_settings': {
             'libraries': [ '-lws2_32.lib', '-lRpcrt4.lib' ],
           },
        }]],
     },
     {
       'target_name': 'process_test',
       'type': 'executable',
       'sources': [
         'process_test.cc',
-      ]
+      ],
+      'conditions': [

[Søren Gjesse, 2012/08/08 11:35:56]

Only use 2 space indentation here.

[jackpal, 2012/08/09 01:09:48]

Fixed by removing this code (which was left in by mistake.)

+          ['dart_want_separate_host_toolset==1', {
+            'toolsets': ['host'],
+          }, {
+            'toolsets': ['target'],
+          }]
+      ],
     },
     {
       'target_name': 'run_vm_tests',
       'type': 'executable',
       'dependencies': [
         'libdart_withcore',
         'libdart_builtin',
         'generate_snapshot_test_dat_file',
       ],
       'include_dirs': [
@@ skipping 27 matching lines @@
         ['include', 'builtin.cc'],
         ['include', '_gen\\.cc$'],
         ['include', '_test\\.(cc|h)$'],
       ],
       'conditions': [
         ['OS=="win"', {
           'link_settings': {
             'libraries': [ '-lws2_32.lib', '-lRpcrt4.lib' ],
           },
         }],
+        ['dart_want_separate_host_toolset==1', {

[Søren Gjesse, 2012/08/08 11:35:56]

Indentation.

[jackpal, 2012/08/09 01:09:48]

Fixed by removing this code (which was left in by mistake.)

+              'toolsets': ['host'],
+            }, {
+              'toolsets': ['target'],
+            }],
       ],
     },
     {
       'target_name': 'test_extension',
       'type': 'shared_library',
       'dependencies': [
         'dart',
       ],
       'include_dirs': [
         '..',
@@ skipping 12 matching lines @@
               'AdditionalDependencies': [ 'dart.lib' ],
               'AdditionalLibraryDirectories': [ '<(PRODUCT_DIR)' ],
             },
           },
         }],
         ['OS=="mac"', {
           'xcode_settings': {
             'OTHER_LDFLAGS': [ '-undefined', 'dynamic_lookup' ],
           },
         }],
+        ['dart_want_separate_host_toolset==1', {

[Søren Gjesse, 2012/08/08 11:35:56]

Ditto.

[jackpal, 2012/08/09 01:09:48]

Fixed by removing this code (which was left in by mistake.)

+              'toolsets': ['host'],
+            }, {
+              'toolsets': ['target'],
+            }],
       ],
     },
   ],
 }