| OLD | NEW |
| 1 { | 1 { |
| 2 'variables': { | 2 'variables': { |
| 3 'chromium_code': 1, | 3 'chromium_code': 1, |
| 4 # Switch to with chrome.sln landing. | 4 # Switch to with chrome.sln landing. |
| 5 #'chrome_grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome', | 5 #'chrome_grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome', |
| 6 'chrome_grit_out_dir': '$(OutDir)/grit_derived_sources', | 6 'chrome_grit_out_dir': '$(OutDir)/grit_derived_sources', |
| 7 'app_grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/app', | 7 'app_grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/app', |
| 8 'webkit_grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/webkit', | 8 'webkit_grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/webkit', |
| 9 |
| 10 # TODO(sgk): eliminate this; see comment in build/common.gypi |
| 11 'msvs_debug_link_incremental': '1', |
| 9 }, | 12 }, |
| 10 'includes': [ | 13 'includes': [ |
| 11 '../../../build/common.gypi', | 14 '../../../build/common.gypi', |
| 12 ], | 15 ], |
| 13 'target_defaults': { | 16 'target_defaults': { |
| 14 'type': 'shared_library', | 17 'type': 'shared_library', |
| 15 'dependencies': [ | 18 'dependencies': [ |
| 16 # Switch to with chrome.sln landing. | 19 # Switch to with chrome.sln landing. |
| 17 #'../../chrome.gyp:chrome_strings', | 20 #'../../chrome.gyp:chrome_strings', |
| 18 ], | 21 ], |
| (...skipping 616 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 635 '<(webkit_grit_out_dir)/webkit_strings_zh-TW.rc', | 638 '<(webkit_grit_out_dir)/webkit_strings_zh-TW.rc', |
| 636 '<(app_grit_out_dir)/app_strings_zh-TW.rc', | 639 '<(app_grit_out_dir)/app_strings_zh-TW.rc', |
| 637 '<(app_grit_out_dir)/app_locale_settings_zh-TW.rc', | 640 '<(app_grit_out_dir)/app_locale_settings_zh-TW.rc', |
| 638 ], | 641 ], |
| 639 }, | 642 }, |
| 640 ], | 643 ], |
| 641 }], | 644 }], |
| 642 ], | 645 ], |
| 643 } | 646 } |
| 644 | 647 |
| OLD | NEW |