Chromium Code Reviews| Index: Source/core/core_derived_sources.gyp |
| diff --git a/Source/core/core_derived_sources.gyp b/Source/core/core_derived_sources.gyp |
| index 0581c844dc31528b048bd66d87744d163a5cd960..2232b3d3f10523248f7c4e2ea85e8ff8a5e11072 100644 |
| --- a/Source/core/core_derived_sources.gyp |
| +++ b/Source/core/core_derived_sources.gyp |
| @@ -603,22 +603,6 @@ |
| '<(SHARED_INTERMEDIATE_DIR)/blink/HTMLMetaElement.cpp', |
| ], |
| }, |
| - { |
| - 'action_name': 'ColorData', |
| - 'inputs': [ |
| - 'platform/ColorData.gperf', |
| - ], |
| - 'outputs': [ |
| - '<(SHARED_INTERMEDIATE_DIR)/blink/ColorData.cpp', |
| - ], |
| - 'action': [ |
| - '<(gperf_exe)', |
| - '--key-positions=*', |
| - '-D', '-s', '2', |
| - '<@(_inputs)', |
| - '--output-file=<(SHARED_INTERMEDIATE_DIR)/blink/ColorData.cpp', |
| - ], |
| - }, |
| ], |
| 'rules': [ |
| { |
| @@ -637,6 +621,24 @@ |
| ], |
| 'msvs_cygwin_shell': 1, |
| }, |
| + { |
| + 'rule_name': 'gperf', |
| + 'extension': 'gperf', |
| + 'outputs': [ |
| + '<(SHARED_INTERMEDIATE_DIR)/blink/<(RULE_INPUT_ROOT).cpp', |
| + ], |
| + 'inputs': [ |
| + '../build/scripts/make-hash-tools.pl', |
| + ], |
| + 'msvs_cygwin_shell': 0, |
| + 'action': [ |
| + '<(perl_exe)', |
| + '../build/scripts/make-hash-tools.pl', |
| + '<(SHARED_INTERMEDIATE_DIR)/blink', |
| + '<(RULE_INPUT_PATH)', |
| + '<(gperf_exe)', |
| + ], |
| + }, |
|
abarth-chromium
2013/10/25 15:24:18
This looks like a bad merge. You don't need to ad
rwlbuis
2013/10/25 15:44:28
Done.
|
| ], |
| }, |
| ], |