| OLD | NEW |
| 1 { | 1 { |
| 2 'variables': { | 2 'variables': { |
| 3 'chromium_code': 1, | 3 'chromium_code': 1, |
| 4 'chrome_grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome', | 4 'chrome_grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome', |
| 5 'app_grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/app', | 5 'app_grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/app', |
| 6 'webkit_grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/webkit', | 6 'webkit_grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/webkit', |
| 7 | 7 |
| 8 # TODO(sgk): eliminate this; see comment in build/common.gypi | 8 # TODO(sgk): eliminate this; see comment in build/common.gypi |
| 9 'msvs_debug_link_incremental': '1', | 9 'msvs_debug_link_incremental': '1', |
| 10 }, | 10 }, |
| 11 'includes': [ | |
| 12 '../../../build/common.gypi', | |
| 13 ], | |
| 14 'target_defaults': { | 11 'target_defaults': { |
| 15 'type': 'loadable_module', | 12 'type': 'loadable_module', |
| 16 'dependencies': [ | 13 'dependencies': [ |
| 17 '../../chrome.gyp:chrome_strings', | 14 '../../chrome.gyp:chrome_strings', |
| 18 '../../../webkit/webkit.gyp:webkit_strings', | 15 '../../../webkit/webkit.gyp:webkit_strings', |
| 19 '../../../app/app.gyp:app_strings', | 16 '../../../app/app.gyp:app_strings', |
| 20 ], | 17 ], |
| 21 'msvs_settings': { | 18 'msvs_settings': { |
| 22 'VCLinkerTool': { | 19 'VCLinkerTool': { |
| 23 'BaseAddress': '0x3CF00000', | 20 'BaseAddress': '0x3CF00000', |
| (...skipping 612 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 636 '<(webkit_grit_out_dir)/webkit_strings_zh-TW.rc', | 633 '<(webkit_grit_out_dir)/webkit_strings_zh-TW.rc', |
| 637 '<(app_grit_out_dir)/app_strings_zh-TW.rc', | 634 '<(app_grit_out_dir)/app_strings_zh-TW.rc', |
| 638 '<(app_grit_out_dir)/app_locale_settings_zh-TW.rc', | 635 '<(app_grit_out_dir)/app_locale_settings_zh-TW.rc', |
| 639 ], | 636 ], |
| 640 }, | 637 }, |
| 641 ], | 638 ], |
| 642 }], | 639 }], |
| 643 ], | 640 ], |
| 644 } | 641 } |
| 645 | 642 |
| OLD | NEW |