Removes references to LIB_DIR from gyp files.

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': {
-    # We place most generated source files in LIB_DIR (rather than, say
-    # SHARED_INTERMEDIATE_DIR) because it is toolset specific. This avoids
-    # two problems. First, if a generated source file has architecture specific
-    # code, we'll get two different files in two different directories. Second,
-    # if a generated source file is needed to build a target with multiple
-    # toolsets, we avoid having duplicate Makefile targets.
-    'gen_source_dir': '<(LIB_DIR)',
+    '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',
     'builtin_in_cc_file': 'builtin_in.cc',
     'builtin_cc_file': '<(gen_source_dir)/builtin_gen.cc',
     'snapshot_in_cc_file': 'snapshot_in.cc',
     'snapshot_bin_file': '<(gen_source_dir)/snapshot_gen.bin',
     'resources_cc_file': '<(gen_source_dir)/resources_gen.cc',
-
-    # The program that creates snapshot_gen.cc is only built and run on the
-    # host, but it must be available when dart is built for the target. Thus,
-    # we keep it in a shared location.
-    'snapshot_cc_file': '<(SHARED_INTERMEDIATE_DIR)/snapshot_gen.cc',
+    'snapshot_cc_file': '<(gen_source_dir)/snapshot_gen.cc',
   },
   'targets': [
     {
       'target_name': 'generate_builtin_cc_file',
       'type': 'none',
-      'toolsets':['target','host'],
+      'toolsets':['host'],
       'includes': [
         'builtin_sources.gypi',
       ],
       'actions': [
         {
           'action_name': 'generate_builtin_cc',
           'inputs': [
             '../tools/gen_library_src_paths.py',
             '<(builtin_in_cc_file)',
             '<@(_sources)',
@@ skipping 11 matching lines @@
             '--library_name', 'dart:builtin',
             '<@(_sources)',
           ],
           'message': 'Generating ''<(builtin_cc_file)'' file.'
         },
       ]
     },
     {
       'target_name': 'generate_io_cc_file',
       'type': 'none',
-      'toolsets':['target','host'],
+      'toolsets':['host'],
       'sources': [
         '../../sdk/lib/io/io.dart',
       ],
       'includes': [
         '../../sdk/lib/io/iolib_sources.gypi',
       ],
       'actions': [
         {
           'action_name': 'generate_io_cc',
           'inputs': [
@@ skipping 14 matching lines @@
             '--library_name', 'dart:io',
             '<@(_sources)',
           ],
           'message': 'Generating ''<(io_cc_file)'' file.'
         },
       ]
     },
     {
       'target_name': 'generate_io_patch_cc_file',
       'type': 'none',
-      'toolsets':['target','host'],
+      'toolsets':['host'],
       'includes': [
         'io_sources.gypi',
       ],
       'actions': [
         {
           'action_name': 'generate_io_patch_cc',
           'inputs': [
             '../tools/gen_library_src_paths.py',
             '<(builtin_in_cc_file)',
             '<@(_sources)',
@@ skipping 13 matching lines @@
           ],
           'message': 'Generating ''<(io_patch_cc_file)'' file.'
         },
       ]
     },
     {
       'target_name': 'libdart_builtin',
       'type': 'static_library',
       'toolsets':['target','host'],
       'dependencies': [
-        'generate_builtin_cc_file',
-        'generate_io_cc_file',
-        'generate_io_patch_cc_file',
+        'generate_builtin_cc_file#host',
+        'generate_io_cc_file#host',
+        'generate_io_patch_cc_file#host',
       ],
       'include_dirs': [
         '..',
       ],
       'sources': [
         'log_android.cc',
         'log_linux.cc',
         'log_macos.cc',
         'log_win.cc',
       ],
@@ skipping 69 matching lines @@
     },
     {
       'target_name': 'libdart_withcore',
       'type': 'static_library',
       'toolsets':['target','host'],
       'dependencies': [
         'libdart_lib_withcore',
         'libdart_vm',
         'libjscre',
         'libdouble_conversion',
-        'generate_version_cc_file',
+        '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',
@@ skipping 99 matching lines @@
             '--input_cc', '<(snapshot_in_cc_file)',
             '--output', '<(snapshot_cc_file)',
           ],
           'message': 'Generating ''<(snapshot_cc_file)'' file.'
         },
       ]
     },
     {
       'target_name': 'generate_resources_cc_file',
       'type': 'none',
+      'toolsets':['host'],
       'includes': [
         'vmstats_sources.gypi',
       ],
       'actions': [
         {
           'action_name': 'generate_resources_cc',
           'inputs': [
             '../tools/create_resources.py',
             '<@(_sources)',
           ],
@@ skipping 13 matching lines @@
     },
     {
       # dart binary with a snapshot of corelibs built in.
       'target_name': 'dart',
       'type': 'executable',
       'dependencies': [
         'libdart',
         'libdart_builtin',
         'libdart_io',
         'generate_snapshot_file#host',
-        'generate_resources_cc_file',
+        'generate_resources_cc_file#host',
       ],
       'include_dirs': [
         '..',
       ],
       'sources': [
         'main.cc',
         'builtin_natives.cc',
         'builtin_nolib.cc',
         'builtin.h',
         'io_natives.h',
@@ skipping 47 matching lines @@
       ],
     },
     {
       # dart binary without any snapshot built in.
       'target_name': 'dart_no_snapshot',
       'type': 'executable',
       'dependencies': [
         'libdart_withcore',
         'libdart_builtin',
         'libdart_io',
-        'generate_resources_cc_file',
+        'generate_resources_cc_file#host',
       ],
       'include_dirs': [
         '..',
       ],
       'sources': [
         'main.cc',
         'builtin.cc',
         'builtin_natives.cc',
         'builtin.h',
         'io_natives.h',
@@ skipping 60 matching lines @@
     },
     {
       'target_name': 'run_vm_tests',
       'type': 'executable',
       'toolsets':['target'],
       'dependencies': [
         'libdart_withcore',
         'libdart_builtin',
         'libdart_io',
         'generate_snapshot_file#host',
-        'generate_snapshot_test_dat_file',
+        'generate_snapshot_test_dat_file#host',
       ],
       'include_dirs': [
         '..',
         '<(gen_source_dir)',
       ],
       'sources': [
         'run_vm_tests.cc',
         'builtin_natives.cc',
         'builtin_nolib.cc',
         'builtin.h',
@@ skipping 50 matching lines @@
     },
     {
       'target_name': 'run_vm_tests.host',
       'type': 'executable',
       'toolsets':['host'],
       'dependencies': [
         'libdart_withcore',
         'libdart_builtin',
         'libdart_io',
         'generate_snapshot_file#host',
-        'generate_snapshot_test_dat_file',
+        'generate_snapshot_test_dat_file#host',
       ],
       'include_dirs': [
         '..',
         '<(gen_source_dir)',
       ],
       'sources': [
         'run_vm_tests.cc',
         'builtin_natives.cc',
         'builtin_nolib.cc',
         'builtin.h',
@@ skipping 76 matching lines @@
                 '-fPIC',
               ],
             }],
           ],
         },
       ],
     }],
   ],
 }