| 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 }, | 9 }, |
| 9 'includes': [ | 10 'includes': [ |
| 10 '../../build/common.gypi', | 11 '../../build/common.gypi', |
| 11 ], | 12 ], |
| 12 'conditions': [ | 13 'conditions': [ |
| 13 ['OS=="win"', { | 14 ['OS=="win"', { |
| 14 'targets': [ | 15 'targets': [ |
| 15 { | 16 { |
| 16 'target_name': 'mini_installer', | 17 'target_name': 'mini_installer', |
| 17 'type': 'executable', | 18 'type': 'executable', |
| (...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 170 'variables': { | 171 'variables': { |
| 171 'branding_dir': '../app/theme/google_chrome', | 172 'branding_dir': '../app/theme/google_chrome', |
| 172 }, | 173 }, |
| 173 }, { # else branding!="Chrome" | 174 }, { # else branding!="Chrome" |
| 174 'variables': { | 175 'variables': { |
| 175 'branding_dir': '../app/theme/chromium', | 176 'branding_dir': '../app/theme/chromium', |
| 176 }, | 177 }, |
| 177 }], | 178 }], |
| 178 ], | 179 ], |
| 179 } | 180 } |
| OLD | NEW |