| OLD | NEW |
| 1 { | 1 { |
| 2 'variables': { | 2 'variables': { |
| 3 'version_py': '../../chrome/tools/build/version.py', | 3 'version_py': '../../chrome/tools/build/version.py', |
| 4 'version_path': '../../chrome/VERSION', | 4 'version_path': '../../chrome/VERSION', |
| 5 'lastchange_path': '<(SHARED_INTERMEDIATE_DIR)/build/LASTCHANGE', | 5 'lastchange_path': '<(SHARED_INTERMEDIATE_DIR)/build/LASTCHANGE', |
| 6 # 'branding_dir' is set in the 'conditions' section at the bottom. | 6 # 'branding_dir' is set in the 'conditions' section at the bottom. |
| 7 'msvs_use_common_release': 0, | 7 'msvs_use_common_release': 0, |
| 8 'msvs_use_common_linker_extras': 0, | 8 'msvs_use_common_linker_extras': 0, |
| 9 }, | 9 }, |
| 10 'includes': [ |
| 11 '../../build/win_precompile.gypi', |
| 12 ], |
| 10 'conditions': [ | 13 'conditions': [ |
| 11 ['OS=="win"', { | 14 ['OS=="win"', { |
| 12 'target_defaults': { | 15 'target_defaults': { |
| 13 'dependencies': [ | 16 'dependencies': [ |
| 14 '../chrome.gyp:chrome', | 17 '../chrome.gyp:chrome', |
| 15 '../chrome.gyp:chrome_nacl_win64', | 18 '../chrome.gyp:chrome_nacl_win64', |
| 16 '../chrome.gyp:chrome_dll', | 19 '../chrome.gyp:chrome_dll', |
| 17 '../chrome.gyp:default_extensions', | 20 '../chrome.gyp:default_extensions', |
| 18 '../chrome.gyp:setup', | 21 '../chrome.gyp:setup', |
| 19 ], | 22 ], |
| (...skipping 206 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 226 'variables': { | 229 'variables': { |
| 227 'branding_dir': '../app/theme/google_chrome', | 230 'branding_dir': '../app/theme/google_chrome', |
| 228 }, | 231 }, |
| 229 }, { # else branding!="Chrome" | 232 }, { # else branding!="Chrome" |
| 230 'variables': { | 233 'variables': { |
| 231 'branding_dir': '../app/theme/chromium', | 234 'branding_dir': '../app/theme/chromium', |
| 232 }, | 235 }, |
| 233 }], | 236 }], |
| 234 ], | 237 ], |
| 235 } | 238 } |
| OLD | NEW |