- Use conditional code inclusion for the dart_no_snapshot and dart executables using the MACRO DART…

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': {
     'gen_source_dir': '<(SHARED_INTERMEDIATE_DIR)',
 
     'io_cc_file': '<(gen_source_dir)/io_gen.cc',
     'io_patch_cc_file': '<(gen_source_dir)/io_patch_gen.cc',
@@ skipping 331 matching lines @@
                 # Needed for sources outside of nss that include pr and ssl
                 # header files.
                 'MDCPUCFG="md/_linux.cfg"',
               ],
             }],
           ],
         },
       },
     },
     {
-      'target_name': 'libdart_withcore',
+      'target_name': 'libdart_nosnapshot',
       'type': 'static_library',
       'toolsets':['target','host'],
       'dependencies': [
-        'libdart_lib_withcore',
-        'libdart_vm',
+        'libdart_lib_nosnapshot',
+        'libdart_vm_nosnapshot',
         'libdouble_conversion',
         'generate_version_cc_file#host',
       ],
       'include_dirs': [
         '..',
       ],
       'sources': [
         '../include/dart_api.h',
         '../include/dart_debugger_api.h',
         '../include/dart_mirrors_api.h',
         '../include/dart_native_api.h',
         '../vm/dart_api_impl.cc',
         '../vm/debugger_api_impl.cc',
         '../vm/mirrors_api_impl.cc',
         '../vm/native_api_impl.cc',
         '<(version_cc_file)',
       ],
       'defines': [
         'DART_SHARED_LIB',
       ],
     },
     {
       # Completely statically linked binary for generating snapshots.
       'target_name': 'gen_snapshot',
       'type': 'executable',
       'toolsets':['host'],
       'dependencies': [
-        'libdart_withcore',
+        'libdart_nosnapshot',
         'libdart_builtin',
       ],
       'include_dirs': [
         '..',
       ],
       'sources': [
         'address_sanitizer.cc',
         'gen_snapshot.cc',
         # Very limited native resolver provided.
         'builtin_gen_snapshot.cc',
@@ skipping 206 matching lines @@
         },
       },
     },
     {
       # dart binary built for the host. It does not use a snapshot
       # and does not include Observatory.
       'target_name': 'dart_bootstrap',
       'type': 'executable',
       'toolsets':['host'],
       'dependencies': [
-        'libdart_withcore',
+        'libdart_nosnapshot',
         'libdart_builtin',
         'libdart_io',
         'generate_bootstrap_resources_cc_file#host',
       ],
       'include_dirs': [
         '..',
       ],
       'sources': [
         'main.cc',
         'builtin_common.cc',
@@ skipping 32 matching lines @@
             '-rdynamic',
           ],
         },
       },
     },
     {
       # dart binary without any snapshot built in.
       'target_name': 'dart_no_snapshot',
       'type': 'executable',
       'dependencies': [
-        'libdart_withcore',
+        'libdart_nosnapshot',
         'libdart_builtin',
         'libdart_io',
         'generate_resources_cc_file#host',
       ],
       'include_dirs': [
         '..',
       ],
       'sources': [
         'main.cc',
         'builtin_common.cc',
@@ skipping 38 matching lines @@
       'target_name': 'process_test',
       'type': 'executable',
       'sources': [
         'process_test.cc',
       ]
     },
     {
       'target_name': 'run_vm_tests',
       'type': 'executable',
       'dependencies': [
-        'libdart_withcore',
+        'libdart',
         'libdart_builtin',
         'libdart_io',
         'generate_snapshot_file#host',
         'generate_snapshot_test_dat_file#host',
       ],
       'include_dirs': [
         '..',
         '<(gen_source_dir)',
       ],
       'sources': [
@@ skipping 74 matching lines @@
         }],
         ['OS=="linux"', {
           'cflags': [
             '-fPIC',
           ],
         }],
       ],
     },
   ],
 }