Chromium Code Reviews| Index: runtime/vm/vm.gypi |
| diff --git a/runtime/vm/vm.gypi b/runtime/vm/vm.gypi |
| index 42576083ce82fd2fa1ac5eefbb794a0148738524..8d8c82f0679ea6267c243f2cb7b47c106121502a 100644 |
| --- a/runtime/vm/vm.gypi |
| +++ b/runtime/vm/vm.gypi |
| @@ -13,8 +13,8 @@ |
| 'corelib_patch_cc_file': '<(gen_source_dir)/corelib_patch_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', |
| + 'internal_cc_file': '<(gen_source_dir)/internal_gen.cc', |
|
Ivan Posva
2014/01/14 23:35:32
s4d
Lasse Reichstein Nielsen
2014/01/15 09:27:42
SOrted below convert. (Although looking up that ab
|
| + 'internal_patch_cc_file': '<(gen_source_dir)/internal_patch_gen.cc', |
| 'convert_cc_file': '<(gen_source_dir)/convert_gen.cc', |
| 'convert_patch_cc_file': '<(gen_source_dir)/convert_patch_gen.cc', |
| 'math_cc_file': '<(gen_source_dir)/math_gen.cc', |
| @@ -91,8 +91,8 @@ |
| '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_internal_cc_file#host', |
|
Ivan Posva
2014/01/14 23:35:32
ditto
Lasse Reichstein Nielsen
2014/01/15 09:27:42
Done.
|
| + 'generate_internal_patch_cc_file#host', |
| 'generate_convert_cc_file#host', |
| 'generate_convert_patch_cc_file#host', |
| 'generate_math_cc_file#host', |
| @@ -122,8 +122,8 @@ |
| '<(corelib_patch_cc_file)', |
| '<(collection_cc_file)', |
| '<(collection_patch_cc_file)', |
| - '<(collection_dev_cc_file)', |
| - '<(collection_dev_patch_cc_file)', |
| + '<(internal_cc_file)', |
|
Ivan Posva
2014/01/14 23:35:32
ditto
Lasse Reichstein Nielsen
2014/01/15 09:27:42
Done.
|
| + '<(internal_patch_cc_file)', |
| '<(convert_cc_file)', |
| '<(convert_patch_cc_file)', |
| '<(math_cc_file)', |
| @@ -319,12 +319,12 @@ |
| ] |
| }, |
| { |
|
Ivan Posva
2014/01/14 23:35:32
These blocks are also sorted.
Lasse Reichstein Nielsen
2014/01/15 09:27:42
I sorted all the library and patch blocks. They ne
|
| - 'target_name': 'generate_collection_dev_patch_cc_file', |
| + 'target_name': 'generate_internal_patch_cc_file', |
| 'type': 'none', |
| 'toolsets':['host'], |
| 'includes': [ |
| # Load the runtime implementation sources. |
| - '../lib/collection_dev_sources.gypi', |
| + '../lib/internal_sources.gypi', |
| ], |
| 'sources/': [ |
| # Exclude all .[cc|h] files. |
| @@ -335,36 +335,36 @@ |
| ], |
| 'actions': [ |
| { |
| - 'action_name': 'generate_collection_dev_patch_cc', |
| + 'action_name': 'generate_internal_patch_cc', |
| 'inputs': [ |
| '../tools/gen_library_src_paths.py', |
| '<(libgen_in_cc_file)', |
| '<@(_sources)', |
| ], |
| 'outputs': [ |
| - '<(collection_dev_patch_cc_file)', |
| + '<(internal_patch_cc_file)', |
| ], |
| 'action': [ |
| 'python', |
| 'tools/gen_library_src_paths.py', |
| - '--output', '<(collection_dev_patch_cc_file)', |
| + '--output', '<(internal_patch_cc_file)', |
| '--input_cc', '<(libgen_in_cc_file)', |
| '--include', 'vm/bootstrap.h', |
| - '--var_name', 'dart::Bootstrap::collection_dev_patch_paths_', |
| - '--library_name', 'dart:_collection-dev', |
| + '--var_name', 'dart::Bootstrap::internal_patch_paths_', |
| + '--library_name', 'dart:_internal', |
| '<@(_sources)', |
| ], |
| - 'message': 'Generating ''<(collection_dev_patch_cc_file)'' file.' |
| + 'message': 'Generating ''<(internal_patch_cc_file)'' file.' |
| }, |
| ] |
| }, |
| { |
| - 'target_name': 'generate_collection_dev_cc_file', |
| + 'target_name': 'generate_internal_cc_file', |
| 'type': 'none', |
| 'toolsets':['host'], |
| 'includes': [ |
| - # Load the shared collection_dev library sources. |
| - '../../sdk/lib/_collection_dev/collection_dev_sources.gypi', |
| + # Load the shared internal library sources. |
| + '../../sdk/lib/internal/internal_sources.gypi', |
| ], |
| 'sources/': [ |
| # Exclude all .[cc|h] files. |
| @@ -375,26 +375,26 @@ |
| ], |
| 'actions': [ |
| { |
| - 'action_name': 'generate_collection_dev_cc', |
| + 'action_name': 'generate_internal_cc', |
| 'inputs': [ |
| '../tools/gen_library_src_paths.py', |
| '<(libgen_in_cc_file)', |
| '<@(_sources)', |
| ], |
| 'outputs': [ |
| - '<(collection_dev_cc_file)', |
| + '<(internal_cc_file)', |
| ], |
| 'action': [ |
| 'python', |
| 'tools/gen_library_src_paths.py', |
| - '--output', '<(collection_dev_cc_file)', |
| + '--output', '<(internal_cc_file)', |
| '--input_cc', '<(libgen_in_cc_file)', |
| '--include', 'vm/bootstrap.h', |
| - '--var_name', 'dart::Bootstrap::collection_dev_source_paths_', |
| - '--library_name', 'dart:_collection-dev', |
| + '--var_name', 'dart::Bootstrap::internal_source_paths_', |
| + '--library_name', 'dart:_internal', |
| '<@(_sources)', |
| ], |
| - 'message': 'Generating ''<(collection_dev_cc_file)'' file.' |
| + 'message': 'Generating ''<(internal_cc_file)'' file.' |
| }, |
| ] |
| }, |