Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(167)

Side by Side Diff: chrome/installer/mini_installer.gyp

Issue 7464040: Integrate syzygy (optionally) into the chrome build process. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Initial review. Created 9 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 'optimize_with_syzygy%': 0,
chrisha 2011/07/26 23:47:24 What does the trailing '%' do?
9 }, 10 },
10 'conditions': [ 11 'conditions': [
11 ['OS=="win"', { 12 ['OS=="win"', {
12 'target_defaults': { 13 'target_defaults': {
13 'dependencies': [ 14 'dependencies': [
14 '../chrome.gyp:chrome', 15 '../chrome.gyp:chrome',
15 '../chrome.gyp:chrome_nacl_win64', 16 '../chrome.gyp:chrome_nacl_win64',
16 '../chrome.gyp:chrome_dll', 17 '../chrome.gyp:chrome_dll',
17 '../chrome.gyp:default_extensions', 18 '../chrome.gyp:default_extensions',
18 '../chrome.gyp:setup', 19 '../chrome.gyp:setup',
(...skipping 149 matching lines...) Expand 10 before | Expand all | Expand 10 after
168 ], 169 ],
169 }, 170 },
170 'targets': [ 171 'targets': [
171 { 172 {
172 'target_name': 'mini_installer', 173 'target_name': 'mini_installer',
173 'type': 'executable', 174 'type': 'executable',
174 'sources': [ 175 'sources': [
175 'mini_installer/chrome.release', 176 'mini_installer/chrome.release',
176 'mini_installer/chrome_appid.cc', 177 'mini_installer/chrome_appid.cc',
177 ], 178 ],
179 'conditions': [
180 ['optimize_with_syzygy==1', {
181 'dependencies' : [
182 '../chrome.gyp:syzygy_optimized_binaries',
183 ],
184 }],
185 ],
178 'rules': [ 186 'rules': [
179 { 187 {
180 'rule_name': 'installer_archive', 188 'rule_name': 'installer_archive',
181 'extension': 'release', 189 'extension': 'release',
182 'variables': { 190 'variables': {
183 'create_installer_archive_py_path': 191 'create_installer_archive_py_path':
184 '../tools/build/win/create_installer_archive.py', 192 '../tools/build/win/create_installer_archive.py',
185 }, 193 },
186 'inputs': [ 194 'inputs': [
187 '<(create_installer_archive_py_path)', 195 '<(create_installer_archive_py_path)',
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
225 'variables': { 233 'variables': {
226 'branding_dir': '../app/theme/google_chrome', 234 'branding_dir': '../app/theme/google_chrome',
227 }, 235 },
228 }, { # else branding!="Chrome" 236 }, { # else branding!="Chrome"
229 'variables': { 237 'variables': {
230 'branding_dir': '../app/theme/chromium', 238 'branding_dir': '../app/theme/chromium',
231 }, 239 },
232 }], 240 }],
233 ], 241 ],
234 } 242 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698