| OLD | NEW |
| 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 { | 4 { |
| 5 'dependencies': [ | 5 'dependencies': [ |
| 6 '<@(chrome_dll_project)', | 6 '<@(chrome_dll_project)', |
| 7 '../chrome.gyp:chrome', | 7 '../chrome.gyp:chrome', |
| 8 '../chrome.gyp:chrome_nacl_win64', | 8 '../chrome.gyp:chrome_nacl_win64', |
| 9 '../chrome.gyp:default_extensions', | 9 '../chrome.gyp:default_extensions', |
| 10 '../chrome.gyp:setup', | 10 '../chrome.gyp:setup', |
| (...skipping 205 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 216 #'--distribution=$(CHROMIUM_BUILD)', | 216 #'--distribution=$(CHROMIUM_BUILD)', |
| 217 '--distribution=_google_chrome', | 217 '--distribution=_google_chrome', |
| 218 # Optional arguments to generate diff installer | 218 # Optional arguments to generate diff installer |
| 219 #'--last_chrome_installer=C:/Temp/base', | 219 #'--last_chrome_installer=C:/Temp/base', |
| 220 #'--setup_exe_format=DIFF', | 220 #'--setup_exe_format=DIFF', |
| 221 #'--diff_algorithm=COURGETTE', | 221 #'--diff_algorithm=COURGETTE', |
| 222 ], | 222 ], |
| 223 'message': 'Create installer archive', | 223 'message': 'Create installer archive', |
| 224 }, | 224 }, |
| 225 ], | 225 ], |
| 226 # TODO(mark): <(branding_dir) should be defined by the | |
| 227 # global condition block at the bottom of the file, but | |
| 228 # this doesn't work due to the following issue: | |
| 229 # | |
| 230 # http://code.google.com/p/gyp/issues/detail?id=22 | |
| 231 # | |
| 232 # Remove this block once the above issue is fixed. | |
| 233 'conditions': [ | 226 'conditions': [ |
| 234 [ 'branding == "Chrome"', { | 227 # TODO(mark): <(branding_dir) should be defined by the |
| 228 # global condition block at the bottom of the file, but |
| 229 # this doesn't work due to the following issue: |
| 230 # |
| 231 # http://code.google.com/p/gyp/issues/detail?id=22 |
| 232 # |
| 233 # Remove this block once the above issue is fixed. |
| 234 ['branding == "Chrome"', { |
| 235 'variables': { | 235 'variables': { |
| 236 'branding_dir': '../app/theme/google_chrome', | 236 'branding_dir': '../app/theme/google_chrome', |
| 237 }, | 237 }, |
| 238 }, { # else branding!="Chrome" | 238 }, { # else branding!="Chrome" |
| 239 'variables': { | 239 'variables': { |
| 240 'branding_dir': '../app/theme/chromium', | 240 'branding_dir': '../app/theme/chromium', |
| 241 }, | 241 }, |
| 242 }], | 242 }], |
| 243 ['OS=="win" and buildtype=="Official"', { |
| 244 # Optimize for size when doing an official build. |
| 245 'optimize' :'size', |
| 246 }], |
| 243 ], | 247 ], |
| 244 } | 248 } |
| OLD | NEW |