| 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 { | 5 { |
| 6 'variables': { | 6 'variables': { |
| 7 'lastchange_path': '../build/util/LASTCHANGE', | 7 'lastchange_path': '../build/util/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 535 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 546 'deb_cmd': ['<@(flock_bash)', '<(deb_build)', '-o' '<(PRODUCT_DIR)', | 546 'deb_cmd': ['<@(flock_bash)', '<(deb_build)', '-o' '<(PRODUCT_DIR)', |
| 547 '-b', '<(PRODUCT_DIR)', '-a', '<(target_arch)'], | 547 '-b', '<(PRODUCT_DIR)', '-a', '<(target_arch)'], |
| 548 'rpm_cmd': ['<@(flock_bash)', '<(rpm_build)', '-o' '<(PRODUCT_DIR)', | 548 'rpm_cmd': ['<@(flock_bash)', '<(rpm_build)', '-o' '<(PRODUCT_DIR)', |
| 549 '-b', '<(PRODUCT_DIR)', '-a', '<(target_arch)'], | 549 '-b', '<(PRODUCT_DIR)', '-a', '<(target_arch)'], |
| 550 'conditions': [ | 550 'conditions': [ |
| 551 ['target_arch=="ia32"', { | 551 ['target_arch=="ia32"', { |
| 552 'deb_arch': 'i386', | 552 'deb_arch': 'i386', |
| 553 'rpm_arch': 'i386', | 553 'rpm_arch': 'i386', |
| 554 'packaging_files_binaries': [ | 554 'packaging_files_binaries': [ |
| 555 '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe', | 555 '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe', |
| 556 '<(PRODUCT_DIR)/nacl_irt_srpc_x86_32.nexe', | |
| 557 ], | 556 ], |
| 558 }], | 557 }], |
| 559 ['target_arch=="x64"', { | 558 ['target_arch=="x64"', { |
| 560 'deb_arch': 'amd64', | 559 'deb_arch': 'amd64', |
| 561 'rpm_arch': 'x86_64', | 560 'rpm_arch': 'x86_64', |
| 562 'packaging_files_binaries': [ | 561 'packaging_files_binaries': [ |
| 563 '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe', | 562 '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe', |
| 564 '<(PRODUCT_DIR)/nacl_irt_srpc_x86_64.nexe', | |
| 565 ], | 563 ], |
| 566 }], | 564 }], |
| 567 ['target_arch=="arm"', { | 565 ['target_arch=="arm"', { |
| 568 'deb_arch': 'arm', | 566 'deb_arch': 'arm', |
| 569 'rpm_arch': 'arm', | 567 'rpm_arch': 'arm', |
| 570 }], | 568 }], |
| 571 ['internal_pdf', { | 569 ['internal_pdf', { |
| 572 'packaging_files_binaries': [ | 570 'packaging_files_binaries': [ |
| 573 '<(PRODUCT_DIR)/libpdf.so', | 571 '<(PRODUCT_DIR)/libpdf.so', |
| 574 ], | 572 ], |
| (...skipping 613 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1188 'branding_dir_100': 'app/theme/default_100_percent/google_chrome', | 1186 'branding_dir_100': 'app/theme/default_100_percent/google_chrome', |
| 1189 }, | 1187 }, |
| 1190 }, { # else branding!="Chrome" | 1188 }, { # else branding!="Chrome" |
| 1191 'variables': { | 1189 'variables': { |
| 1192 'branding_dir': 'app/theme/chromium', | 1190 'branding_dir': 'app/theme/chromium', |
| 1193 'branding_dir_100': 'app/theme/default_100_percent/chromium', | 1191 'branding_dir_100': 'app/theme/default_100_percent/chromium', |
| 1194 }, | 1192 }, |
| 1195 }], | 1193 }], |
| 1196 ], | 1194 ], |
| 1197 } | 1195 } |
| OLD | NEW |