Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(152)

Side by Side Diff: runtime/bin/bin.gypi

Issue 169753003: Don't depend on libdart_io in run_vm_tests and gen_snapshot. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Make run_vm_tests pass again. Note sure about run_vm_tests.host. Created 6 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | runtime/bin/builtin_impl_sources.gypi » ('j') | runtime/bin/builtin_no_io.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file 1 # Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file
2 # for details. All rights reserved. Use of this source code is governed by a 2 # for details. All rights reserved. Use of this source code is governed by a
3 # BSD-style license that can be found in the LICENSE file. 3 # BSD-style license that can be found in the LICENSE file.
4 4
5 { 5 {
6 'variables': { 6 'variables': {
7 'gen_source_dir': '<(SHARED_INTERMEDIATE_DIR)', 7 'gen_source_dir': '<(SHARED_INTERMEDIATE_DIR)',
8 8
9 'io_cc_file': '<(gen_source_dir)/io_gen.cc', 9 'io_cc_file': '<(gen_source_dir)/io_gen.cc',
10 'io_patch_cc_file': '<(gen_source_dir)/io_patch_gen.cc', 10 'io_patch_cc_file': '<(gen_source_dir)/io_patch_gen.cc',
(...skipping 150 matching lines...) Expand 10 before | Expand all | Expand 10 after
161 ['OS=="linux"', { 161 ['OS=="linux"', {
162 'link_settings': { 162 'link_settings': {
163 'libraries': [ 163 'libraries': [
164 '-ldl', 164 '-ldl',
165 ], 165 ],
166 }, 166 },
167 }], 167 }],
168 ], 168 ],
169 }, 169 },
170 { 170 {
171 'target_name': 'libdart_builtin_no_io',
Ivan Posva 2014/02/25 07:53:12 I am a bit puzzled by this new target as it does n
Anders Johnsen 2014/02/25 08:31:32 Yeah, you are 100% right. This was a solution to a
172 'type': 'static_library',
173 'toolsets':['target','host'],
174 'include_dirs': [
175 '..',
176 ],
177 'sources': [
178 'builtin_no_io.cc',
179 ],
180 'conditions': [
181 ['OS=="linux"', {
182 'link_settings': {
183 'libraries': [
184 '-ldl',
185 ],
186 },
187 }],
188 ],
189 },
190 {
171 'target_name': 'libdart_io', 191 'target_name': 'libdart_io',
172 'type': 'static_library', 192 'type': 'static_library',
173 'toolsets':['target', 'host'], 193 'toolsets':['target'],
174 'include_dirs': [ 194 'include_dirs': [
175 '..', 195 '..',
176 ], 196 ],
177 'includes': [ 197 'includes': [
178 'io_impl_sources.gypi', 198 'io_impl_sources.gypi',
179 ], 199 ],
180 'sources': [ 200 'sources': [
181 'io_natives.h', 201 'io_natives.h',
182 'io_natives.cc', 202 'io_natives.cc',
183 ], 203 ],
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
249 ], 269 ],
250 }, 270 },
251 { 271 {
252 # Completely statically linked binary for generating snapshots. 272 # Completely statically linked binary for generating snapshots.
253 'target_name': 'gen_snapshot', 273 'target_name': 'gen_snapshot',
254 'type': 'executable', 274 'type': 'executable',
255 'toolsets':['host'], 275 'toolsets':['host'],
256 'dependencies': [ 276 'dependencies': [
257 'libdart_withcore', 277 'libdart_withcore',
258 'libdart_builtin', 278 'libdart_builtin',
259 'libdart_io',
260 ], 279 ],
261 'include_dirs': [ 280 'include_dirs': [
262 '..', 281 '..',
263 ], 282 ],
264 'sources': [ 283 'sources': [
265 'gen_snapshot.cc', 284 'gen_snapshot.cc',
266 # Very limited native resolver provided. 285 # Very limited native resolver provided.
267 'builtin_gen_snapshot.cc', 286 'builtin_gen_snapshot.cc',
268 'builtin.cc', 287 'builtin.cc',
269 'builtin.h', 288 'builtin.h',
(...skipping 271 matching lines...) Expand 10 before | Expand all | Expand 10 after
541 }], 560 }],
542 ], 561 ],
543 }, 562 },
544 { 563 {
545 'target_name': 'run_vm_tests.host', 564 'target_name': 'run_vm_tests.host',
546 'type': 'executable', 565 'type': 'executable',
547 'toolsets':['host'], 566 'toolsets':['host'],
548 'dependencies': [ 567 'dependencies': [
549 'libdart_withcore', 568 'libdart_withcore',
550 'libdart_builtin', 569 'libdart_builtin',
551 'libdart_io',
552 'generate_snapshot_file#host', 570 'generate_snapshot_file#host',
553 'generate_snapshot_test_dat_file#host', 571 'generate_snapshot_test_dat_file#host',
554 ], 572 ],
555 'include_dirs': [ 573 'include_dirs': [
556 '..', 574 '..',
557 '<(gen_source_dir)', 575 '<(gen_source_dir)',
558 ], 576 ],
559 'sources': [ 577 'sources': [
560 'run_vm_tests.cc', 578 'run_vm_tests.cc',
561 'builtin_natives.cc', 579 'builtin_natives.cc',
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
633 }], 651 }],
634 ['OS=="linux"', { 652 ['OS=="linux"', {
635 'cflags': [ 653 'cflags': [
636 '-fPIC', 654 '-fPIC',
637 ], 655 ],
638 }], 656 }],
639 ], 657 ],
640 }, 658 },
641 ], 659 ],
642 } 660 }
OLDNEW
« no previous file with comments | « no previous file | runtime/bin/builtin_impl_sources.gypi » ('j') | runtime/bin/builtin_no_io.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698