Index: runtime/vm/vm.gypi |
diff --git a/runtime/vm/vm.gypi b/runtime/vm/vm.gypi |
index 3e0311abc94c59eddd0034e9f01453e7d7300ec2..a1f5555d60ac96b34a6f2b34b3d2754d410145eb 100644 |
--- a/runtime/vm/vm.gypi |
+++ b/runtime/vm/vm.gypi |
@@ -11,10 +11,12 @@ |
'async_patch_cc_file': '<(gen_source_dir)/async_patch_gen.cc', |
'corelib_cc_file': '<(gen_source_dir)/corelib_gen.cc', |
'corelib_patch_cc_file': '<(gen_source_dir)/corelib_patch_gen.cc', |
+ 'codec_cc_file': '<(gen_source_dir)/codec_gen.cc', |
'collection_cc_file': '<(gen_source_dir)/collection_gen.cc', |
'collection_patch_cc_file': '<(gen_source_dir)/collection_patch_gen.cc', |
'collection_dev_cc_file': '<(gen_source_dir)/collection_dev_gen.cc', |
'collection_dev_patch_cc_file': '<(gen_source_dir)/collection_dev_patch_gen.cc', |
+ 'convert_cc_file': '<(gen_source_dir)/convert_gen.cc', |
'math_cc_file': '<(gen_source_dir)/math_gen.cc', |
'math_patch_cc_file': '<(gen_source_dir)/math_patch_gen.cc', |
'mirrors_cc_file': '<(gen_source_dir)/mirrors_gen.cc', |
@@ -95,12 +97,14 @@ |
'dependencies': [ |
'generate_async_cc_file#host', |
'generate_async_patch_cc_file#host', |
+ 'generate_codec_cc_file#host', |
'generate_corelib_cc_file#host', |
'generate_corelib_patch_cc_file#host', |
'generate_collection_cc_file#host', |
'generate_collection_patch_cc_file#host', |
'generate_collection_dev_cc_file#host', |
'generate_collection_dev_patch_cc_file#host', |
+ 'generate_convert_cc_file#host', |
'generate_math_cc_file#host', |
'generate_math_patch_cc_file#host', |
'generate_isolate_cc_file#host', |
@@ -127,12 +131,14 @@ |
# Include generated source files. |
'<(async_cc_file)', |
'<(async_patch_cc_file)', |
+ '<(codec_cc_file)', |
'<(corelib_cc_file)', |
'<(corelib_patch_cc_file)', |
'<(collection_cc_file)', |
'<(collection_patch_cc_file)', |
'<(collection_dev_cc_file)', |
'<(collection_dev_patch_cc_file)', |
+ '<(convert_cc_file)', |
'<(math_cc_file)', |
'<(math_patch_cc_file)', |
'<(isolate_cc_file)', |
@@ -329,6 +335,46 @@ |
] |
}, |
{ |
+ 'target_name': 'generate_codec_cc_file', |
+ 'type': 'none', |
+ 'toolsets':['host'], |
+ 'includes': [ |
+ # Load the shared codec library sources. |
+ '../../sdk/lib/codec/codec_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_codec_cc', |
+ 'inputs': [ |
+ '../tools/gen_library_src_paths.py', |
+ '<(libgen_in_cc_file)', |
+ '<@(_sources)', |
+ ], |
+ 'outputs': [ |
+ '<(codec_cc_file)', |
+ ], |
+ 'action': [ |
+ 'python', |
+ 'tools/gen_library_src_paths.py', |
+ '--output', '<(codec_cc_file)', |
+ '--input_cc', '<(libgen_in_cc_file)', |
+ '--include', 'vm/bootstrap.h', |
+ '--var_name', 'dart::Bootstrap::codec_source_paths_', |
+ '--library_name', 'dart:codec', |
+ '<@(_sources)', |
+ ], |
+ 'message': 'Generating ''<(codec_cc_file)'' file.' |
+ }, |
+ ] |
+ }, |
+ { |
'target_name': 'generate_collection_dev_patch_cc_file', |
'type': 'none', |
'toolsets':['host'], |
@@ -409,6 +455,46 @@ |
] |
}, |
{ |
+ 'target_name': 'generate_convert_cc_file', |
+ 'type': 'none', |
+ 'toolsets':['host'], |
+ 'includes': [ |
+ # Load the shared convert library sources. |
+ '../../sdk/lib/convert/convert_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_convert_cc', |
+ 'inputs': [ |
+ '../tools/gen_library_src_paths.py', |
+ '<(libgen_in_cc_file)', |
+ '<@(_sources)', |
+ ], |
+ 'outputs': [ |
+ '<(convert_cc_file)', |
+ ], |
+ 'action': [ |
+ 'python', |
+ 'tools/gen_library_src_paths.py', |
+ '--output', '<(convert_cc_file)', |
+ '--input_cc', '<(libgen_in_cc_file)', |
+ '--include', 'vm/bootstrap.h', |
+ '--var_name', 'dart::Bootstrap::convert_source_paths_', |
+ '--library_name', 'dart:convert', |
+ '<@(_sources)', |
+ ], |
+ 'message': 'Generating ''<(convert_cc_file)'' file.' |
+ }, |
+ ] |
+ }, |
+ { |
'target_name': 'generate_math_cc_file', |
'type': 'none', |
'toolsets':['host'], |