| 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 'webkit_grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/webkit', | 5 'webkit_grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/webkit', |
| 6 | 6 |
| 7 'app_grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/app', | 7 'app_grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/app', |
| 8 'app_strings_out_dir': '<(app_grit_out_dir)/app_strings', | 8 'app_strings_out_dir': '<(app_grit_out_dir)/app_strings', |
| 9 'app_locale_out_dir': '<(app_grit_out_dir)/app_locale_settings', | 9 'app_locale_out_dir': '<(app_grit_out_dir)/app_locale_settings', |
| 10 | 10 |
| 11 # TODO(sgk): eliminate this; see comment in build/common.gypi | 11 # TODO(sgk): eliminate this; see comment in build/common.gypi |
| 12 'msvs_debug_link_incremental': '1', | 12 'msvs_debug_link_incremental': '1', |
| 13 | 13 |
| 14 # Decide which .rc file to use for strings based on branding | 14 # Decide which .rc file to use for strings based on branding |
| 15 'conditions': [ | 15 'conditions': [ |
| 16 ['branding=="Chrome"', { | 16 ['branding=="Chrome"', { |
| 17 'strings_rc_name': 'strings_google_chrome', | 17 'strings_rc_name': 'strings_google_chrome', |
| 18 }, { | 18 }, { |
| 19 'strings_rc_name': 'strings', | 19 'strings_rc_name': 'strings', |
| 20 }], | 20 }], |
| 21 ], | 21 ], |
| 22 }, | 22 }, |
| 23 'target_defaults': { | 23 'target_defaults': { |
| 24 'type': 'loadable_module', | 24 'type': 'loadable_module', |
| 25 'dependencies': [ | 25 'dependencies': [ |
| 26 '../../chrome.gyp:chrome_strings', | 26 '../../chrome.gyp:chrome_strings', |
| 27 '../../chrome.gyp:platform_locale_settings', | 27 '../../chrome.gyp:platform_locale_settings', |
| 28 '../../../webkit/support/webkit_support_in_chromium.gyp:webkit_strings', | 28 '../../../webkit/support/webkit_support.gyp:webkit_strings', |
| 29 '../../../app/app.gyp:app_strings', | 29 '../../../app/app.gyp:app_strings', |
| 30 ], | 30 ], |
| 31 'msvs_settings': { | 31 'msvs_settings': { |
| 32 'VCLinkerTool': { | 32 'VCLinkerTool': { |
| 33 'BaseAddress': '0x3CF00000', | 33 'BaseAddress': '0x3CF00000', |
| 34 'OutputFile': '$(OutDir)\\locales\\$(ProjectName).dll', | 34 'OutputFile': '$(OutDir)\\locales\\$(ProjectName).dll', |
| 35 'LinkIncremental': '1', # 1 == No | 35 'LinkIncremental': '1', # 1 == No |
| 36 'LinkTimeCodeGeneration': '0', | 36 'LinkTimeCodeGeneration': '0', |
| 37 'ResourceOnlyDLL': 'true', | 37 'ResourceOnlyDLL': 'true', |
| 38 }, | 38 }, |
| (...skipping 675 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 714 ], | 714 ], |
| 715 }], | 715 }], |
| 716 ], | 716 ], |
| 717 } | 717 } |
| 718 | 718 |
| 719 # Local Variables: | 719 # Local Variables: |
| 720 # tab-width:2 | 720 # tab-width:2 |
| 721 # indent-tabs-mode:nil | 721 # indent-tabs-mode:nil |
| 722 # End: | 722 # End: |
| 723 # vim: set expandtab tabstop=2 shiftwidth=2: | 723 # vim: set expandtab tabstop=2 shiftwidth=2: |
| OLD | NEW |