| OLD | NEW |
| 1 { | 1 { |
| 2 'variables': { | 2 'variables': { |
| 3 'chromium_code': 1, | 3 'chromium_code': 1, |
| 4 # Switch to with chrome.sln landing. | 4 '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', | |
| 7 'app_grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/app', | 5 'app_grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/app', |
| 8 'webkit_grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/webkit', | 6 'webkit_grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/webkit', |
| 9 | 7 |
| 10 # TODO(sgk): eliminate this; see comment in build/common.gypi | 8 # TODO(sgk): eliminate this; see comment in build/common.gypi |
| 11 'msvs_debug_link_incremental': '1', | 9 'msvs_debug_link_incremental': '1', |
| 12 }, | 10 }, |
| 13 'includes': [ | 11 'includes': [ |
| 14 '../../../build/common.gypi', | 12 '../../../build/common.gypi', |
| 15 ], | 13 ], |
| 16 'target_defaults': { | 14 'target_defaults': { |
| (...skipping 622 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 639 '<(webkit_grit_out_dir)/webkit_strings_zh-TW.rc', | 637 '<(webkit_grit_out_dir)/webkit_strings_zh-TW.rc', |
| 640 '<(app_grit_out_dir)/app_strings_zh-TW.rc', | 638 '<(app_grit_out_dir)/app_strings_zh-TW.rc', |
| 641 '<(app_grit_out_dir)/app_locale_settings_zh-TW.rc', | 639 '<(app_grit_out_dir)/app_locale_settings_zh-TW.rc', |
| 642 ], | 640 ], |
| 643 }, | 641 }, |
| 644 ], | 642 ], |
| 645 }], | 643 }], |
| 646 ], | 644 ], |
| 647 } | 645 } |
| 648 | 646 |
| OLD | NEW |