| 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 }, | 8 }, |
| 9 'includes': [ | 9 'includes': [ |
| 10 '../../build/common.gypi', | 10 '../../build/common.gypi', |
| 11 ], | 11 ], |
| 12 'conditions': [ | 12 'conditions': [ |
| 13 ['OS=="win"', { | 13 ['OS=="win"', { |
| 14 'targets': [ | 14 'targets': [ |
| 15 { | 15 { |
| 16 'target_name': 'mini_installer', | 16 'target_name': 'mini_installer', |
| 17 'type': 'executable', | 17 'type': 'executable', |
| 18 'msvs_guid': '24A5AC7C-280B-4899-9153-6BA570A081E7', | 18 'msvs_guid': '24A5AC7C-280B-4899-9153-6BA570A081E7', |
| 19 'dependencies': [ | 19 'dependencies': [ |
| 20 '../chrome.gyp:chrome', | 20 '../chrome.gyp:chrome', |
| 21 '../chrome.gyp:chrome_dll', | 21 '../chrome.gyp:chrome_dll', |
| 22 '../chrome.gyp:default_extensions', |
| 22 '../../testing/gtest.gyp:gtest', | 23 '../../testing/gtest.gyp:gtest', |
| 23 'installer.gyp:setup', | 24 'installer.gyp:setup', |
| 24 ], | 25 ], |
| 25 'include_dirs': [ | 26 'include_dirs': [ |
| 26 '../..', | 27 '../..', |
| 27 '<(PRODUCT_DIR)', | 28 '<(PRODUCT_DIR)', |
| 28 '<(INTERMEDIATE_DIR)', | 29 '<(INTERMEDIATE_DIR)', |
| 29 ], | 30 ], |
| 30 'sources': [ | 31 'sources': [ |
| 31 'mini_installer/chrome.release', | 32 'mini_installer/chrome.release', |
| (...skipping 138 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 |