| OLD | NEW |
| 1 # Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2011 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 { | 5 { |
| 6 'variables': { | 6 'variables': { |
| 7 'lastchange_path': '<(SHARED_INTERMEDIATE_DIR)/build/LASTCHANGE', | 7 'lastchange_path': '<(SHARED_INTERMEDIATE_DIR)/build/LASTCHANGE', |
| 8 # 'branding_dir' is set in the 'conditions' section at the bottom. | 8 # 'branding_dir' is set in the 'conditions' section at the bottom. |
| 9 }, | 9 }, |
| 10 'conditions': [ | 10 'conditions': [ |
| (...skipping 398 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 409 '<(PRODUCT_DIR)/chrome', | 409 '<(PRODUCT_DIR)/chrome', |
| 410 '<(PRODUCT_DIR)/chrome.pak', | 410 '<(PRODUCT_DIR)/chrome.pak', |
| 411 '<(PRODUCT_DIR)/chrome_sandbox', | 411 '<(PRODUCT_DIR)/chrome_sandbox', |
| 412 '<(PRODUCT_DIR)/libffmpegsumo.so', | 412 '<(PRODUCT_DIR)/libffmpegsumo.so', |
| 413 '<(PRODUCT_DIR)/libppGoogleNaClPluginChrome.so', | 413 '<(PRODUCT_DIR)/libppGoogleNaClPluginChrome.so', |
| 414 '<(PRODUCT_DIR)/xdg-mime', | 414 '<(PRODUCT_DIR)/xdg-mime', |
| 415 '<(PRODUCT_DIR)/xdg-settings', | 415 '<(PRODUCT_DIR)/xdg-settings', |
| 416 '<(PRODUCT_DIR)/locales/en-US.pak', | 416 '<(PRODUCT_DIR)/locales/en-US.pak', |
| 417 '<(PRODUCT_DIR)/nacl_helper', | 417 '<(PRODUCT_DIR)/nacl_helper', |
| 418 '<(PRODUCT_DIR)/nacl_helper_bootstrap', | 418 '<(PRODUCT_DIR)/nacl_helper_bootstrap', |
| 419 '<@(default_apps_list_linux_dest)', |
| 419 ], | 420 ], |
| 420 'flock_bash': ['flock', '--', '/tmp/linux_package_lock', 'bash'], | 421 'flock_bash': ['flock', '--', '/tmp/linux_package_lock', 'bash'], |
| 421 'deb_build': '<(PRODUCT_DIR)/installer/debian/build.sh', | 422 'deb_build': '<(PRODUCT_DIR)/installer/debian/build.sh', |
| 422 'rpm_build': '<(PRODUCT_DIR)/installer/rpm/build.sh', | 423 'rpm_build': '<(PRODUCT_DIR)/installer/rpm/build.sh', |
| 423 'deb_cmd': ['<@(flock_bash)', '<(deb_build)', '-o' '<(PRODUCT_DIR)', | 424 'deb_cmd': ['<@(flock_bash)', '<(deb_build)', '-o' '<(PRODUCT_DIR)', |
| 424 '-b', '<(PRODUCT_DIR)', '-a', '<(target_arch)'], | 425 '-b', '<(PRODUCT_DIR)', '-a', '<(target_arch)'], |
| 425 'rpm_cmd': ['<@(flock_bash)', '<(rpm_build)', '-o' '<(PRODUCT_DIR)', | 426 'rpm_cmd': ['<@(flock_bash)', '<(rpm_build)', '-o' '<(PRODUCT_DIR)', |
| 426 '-b', '<(PRODUCT_DIR)', '-a', '<(target_arch)'], | 427 '-b', '<(PRODUCT_DIR)', '-a', '<(target_arch)'], |
| 427 'conditions': [ | 428 'conditions': [ |
| 428 ['target_arch=="ia32"', { | 429 ['target_arch=="ia32"', { |
| (...skipping 492 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 921 'variables': { | 922 'variables': { |
| 922 'branding_dir': 'app/theme/google_chrome', | 923 'branding_dir': 'app/theme/google_chrome', |
| 923 }, | 924 }, |
| 924 }, { # else branding!="Chrome" | 925 }, { # else branding!="Chrome" |
| 925 'variables': { | 926 'variables': { |
| 926 'branding_dir': 'app/theme/chromium', | 927 'branding_dir': 'app/theme/chromium', |
| 927 }, | 928 }, |
| 928 }], | 929 }], |
| 929 ], | 930 ], |
| 930 } | 931 } |
| OLD | NEW |