| Index: runtime/vm/vm.gypi
|
| diff --git a/runtime/vm/vm.gypi b/runtime/vm/vm.gypi
|
| index c38c55b8d05142a0bb22a36dc9168b5abd56b1ad..3dbe3895081bf596e47a800ec5c3dd38d7c2e1fa 100644
|
| --- a/runtime/vm/vm.gypi
|
| +++ b/runtime/vm/vm.gypi
|
| @@ -15,6 +15,8 @@
|
| 'collection_patch_cc_file': '<(gen_source_dir)/collection_patch_gen.cc',
|
| 'convert_cc_file': '<(gen_source_dir)/convert_gen.cc',
|
| 'convert_patch_cc_file': '<(gen_source_dir)/convert_patch_gen.cc',
|
| + 'debugger_cc_file': '<(gen_source_dir)/debugger_gen.cc',
|
| + 'debugger_patch_cc_file': '<(gen_source_dir)/debugger_patch_gen.cc',
|
| 'internal_cc_file': '<(gen_source_dir)/internal_gen.cc',
|
| 'internal_patch_cc_file': '<(gen_source_dir)/internal_patch_gen.cc',
|
| 'isolate_cc_file': '<(gen_source_dir)/isolate_gen.cc',
|
| @@ -23,14 +25,14 @@
|
| 'math_patch_cc_file': '<(gen_source_dir)/math_patch_gen.cc',
|
| 'mirrors_cc_file': '<(gen_source_dir)/mirrors_gen.cc',
|
| 'mirrors_patch_cc_file': '<(gen_source_dir)/mirrors_patch_gen.cc',
|
| + 'profiler_cc_file': '<(gen_source_dir)/profiler_gen.cc',
|
| + 'profiler_patch_cc_file': '<(gen_source_dir)/profiler_patch_gen.cc',
|
| 'service_cc_file': '<(gen_source_dir)/service_gen.cc',
|
| 'snapshot_test_dat_file': '<(gen_source_dir)/snapshot_test.dat',
|
| 'snapshot_test_in_dat_file': 'snapshot_test_in.dat',
|
| 'snapshot_test_dart_file': 'snapshot_test.dart',
|
| 'typed_data_cc_file': '<(gen_source_dir)/typed_data_gen.cc',
|
| 'typed_data_patch_cc_file': '<(gen_source_dir)/typed_data_patch_gen.cc',
|
| - 'profiler_cc_file': '<(gen_source_dir)/profiler_gen.cc',
|
| - 'profiler_patch_cc_file': '<(gen_source_dir)/profiler_patch_gen.cc',
|
| },
|
| 'targets': [
|
| {
|
| @@ -113,6 +115,8 @@
|
| 'generate_collection_patch_cc_file#host',
|
| 'generate_convert_cc_file#host',
|
| 'generate_convert_patch_cc_file#host',
|
| + 'generate_debugger_cc_file#host',
|
| + 'generate_debugger_patch_cc_file#host',
|
| 'generate_internal_cc_file#host',
|
| 'generate_internal_patch_cc_file#host',
|
| 'generate_isolate_cc_file#host',
|
| @@ -121,21 +125,22 @@
|
| 'generate_math_patch_cc_file#host',
|
| 'generate_mirrors_cc_file#host',
|
| 'generate_mirrors_patch_cc_file#host',
|
| - 'generate_typed_data_cc_file#host',
|
| - 'generate_typed_data_patch_cc_file#host',
|
| 'generate_profiler_cc_file#host',
|
| 'generate_profiler_patch_cc_file#host',
|
| + 'generate_typed_data_cc_file#host',
|
| + 'generate_typed_data_patch_cc_file#host',
|
| ],
|
| 'includes': [
|
| '../lib/async_sources.gypi',
|
| '../lib/collection_sources.gypi',
|
| '../lib/core_sources.gypi',
|
| + '../lib/debugger_sources.gypi',
|
| + '../lib/internal_sources.gypi',
|
| '../lib/isolate_sources.gypi',
|
| '../lib/math_sources.gypi',
|
| '../lib/mirrors_sources.gypi',
|
| - '../lib/typed_data_sources.gypi',
|
| '../lib/profiler_sources.gypi',
|
| - '../lib/internal_sources.gypi',
|
| + '../lib/typed_data_sources.gypi',
|
| ],
|
| 'sources': [
|
| 'bootstrap.cc',
|
| @@ -148,6 +153,8 @@
|
| '<(collection_patch_cc_file)',
|
| '<(convert_cc_file)',
|
| '<(convert_patch_cc_file)',
|
| + '<(debugger_cc_file)',
|
| + '<(debugger_patch_cc_file)',
|
| '<(internal_cc_file)',
|
| '<(internal_patch_cc_file)',
|
| '<(isolate_cc_file)',
|
| @@ -156,10 +163,10 @@
|
| '<(math_patch_cc_file)',
|
| '<(mirrors_cc_file)',
|
| '<(mirrors_patch_cc_file)',
|
| - '<(typed_data_cc_file)',
|
| - '<(typed_data_patch_cc_file)',
|
| '<(profiler_cc_file)',
|
| '<(profiler_patch_cc_file)',
|
| + '<(typed_data_cc_file)',
|
| + '<(typed_data_patch_cc_file)',
|
| ],
|
| 'include_dirs': [
|
| '..',
|
| @@ -173,12 +180,13 @@
|
| '../lib/async_sources.gypi',
|
| '../lib/collection_sources.gypi',
|
| '../lib/core_sources.gypi',
|
| + '../lib/debugger_sources.gypi',
|
| + '../lib/internal_sources.gypi',
|
| '../lib/isolate_sources.gypi',
|
| '../lib/math_sources.gypi',
|
| '../lib/mirrors_sources.gypi',
|
| - '../lib/typed_data_sources.gypi',
|
| '../lib/profiler_sources.gypi',
|
| - '../lib/internal_sources.gypi',
|
| + '../lib/typed_data_sources.gypi',
|
| ],
|
| 'sources': [
|
| 'bootstrap_nocore.cc',
|
| @@ -987,6 +995,86 @@
|
| ]
|
| },
|
| {
|
| + 'target_name': 'generate_debugger_cc_file',
|
| + 'type': 'none',
|
| + 'toolsets':['host'],
|
| + 'includes': [
|
| + # Load the shared library sources.
|
| + '../../sdk/lib/debugger/debugger_sources.gypi',
|
| + ],
|
| + 'sources/': [
|
| + # Exclude all .[cc|h] files.
|
| + # This is only here for reference. Excludes happen after
|
| + # variable expansion, so the script has to do its own
|
| + # exclude processing of the sources being passed.
|
| + ['exclude', '\\.cc|h$'],
|
| + ],
|
| + 'actions': [
|
| + {
|
| + 'action_name': 'generate_debugger_cc',
|
| + 'inputs': [
|
| + '../tools/gen_library_src_paths.py',
|
| + '<(libgen_in_cc_file)',
|
| + '<@(_sources)',
|
| + ],
|
| + 'outputs': [
|
| + '<(debugger_cc_file)',
|
| + ],
|
| + 'action': [
|
| + 'python',
|
| + 'tools/gen_library_src_paths.py',
|
| + '--output', '<(debugger_cc_file)',
|
| + '--input_cc', '<(libgen_in_cc_file)',
|
| + '--include', 'vm/bootstrap.h',
|
| + '--var_name', 'dart::Bootstrap::debugger_source_paths_',
|
| + '--library_name', 'dart:debugger',
|
| + '<@(_sources)',
|
| + ],
|
| + 'message': 'Generating ''<(debugger_cc_file)'' file.'
|
| + },
|
| + ]
|
| + },
|
| + {
|
| + 'target_name': 'generate_debugger_patch_cc_file',
|
| + 'type': 'none',
|
| + 'toolsets':['host'],
|
| + 'includes': [
|
| + # Load the runtime implementation sources.
|
| + '../lib/debugger_sources.gypi',
|
| + ],
|
| + 'sources/': [
|
| + # Exclude all .[cc|h] files.
|
| + # This is only here for reference. Excludes happen after
|
| + # variable expansion, so the script has to do its own
|
| + # exclude processing of the sources being passed.
|
| + ['exclude', '\\.cc|h$'],
|
| + ],
|
| + 'actions': [
|
| + {
|
| + 'action_name': 'generate_debugger_patch_cc',
|
| + 'inputs': [
|
| + '../tools/gen_library_src_paths.py',
|
| + '<(libgen_in_cc_file)',
|
| + '<@(_sources)',
|
| + ],
|
| + 'outputs': [
|
| + '<(debugger_patch_cc_file)',
|
| + ],
|
| + 'action': [
|
| + 'python',
|
| + 'tools/gen_library_src_paths.py',
|
| + '--output', '<(debugger_patch_cc_file)',
|
| + '--input_cc', '<(libgen_in_cc_file)',
|
| + '--include', 'vm/bootstrap.h',
|
| + '--var_name', 'dart::Bootstrap::debugger_patch_paths_',
|
| + '--library_name', 'dart:debugger',
|
| + '<@(_sources)',
|
| + ],
|
| + 'message': 'Generating ''<(debugger_patch_cc_file)'' file.'
|
| + },
|
| + ]
|
| + },
|
| + {
|
| 'target_name': 'generate_snapshot_test_dat_file',
|
| 'type': 'none',
|
| 'toolsets':['host'],
|
|
|