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

Side by Side Diff: chrome/chrome_installer.gypi

Issue 11275326: Change the names of the NaCl IRT files to solve ChromeOS packaging issue. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 1 month 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
« no previous file with comments | « chrome/chrome_dll.gypi ('k') | chrome/installer/mini_installer.gyp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 532 matching lines...) Expand 10 before | Expand all | Expand 10 after
543 'deb_cmd': ['<@(flock_bash)', '<(deb_build)', '-o' '<(PRODUCT_DIR)', 543 'deb_cmd': ['<@(flock_bash)', '<(deb_build)', '-o' '<(PRODUCT_DIR)',
544 '-b', '<(PRODUCT_DIR)', '-a', '<(target_arch)'], 544 '-b', '<(PRODUCT_DIR)', '-a', '<(target_arch)'],
545 'rpm_cmd': ['<@(flock_bash)', '<(rpm_build)', '-o' '<(PRODUCT_DIR)', 545 'rpm_cmd': ['<@(flock_bash)', '<(rpm_build)', '-o' '<(PRODUCT_DIR)',
546 '-b', '<(PRODUCT_DIR)', '-a', '<(target_arch)'], 546 '-b', '<(PRODUCT_DIR)', '-a', '<(target_arch)'],
547 'conditions': [ 547 'conditions': [
548 ['target_arch=="ia32"', { 548 ['target_arch=="ia32"', {
549 'deb_arch': 'i386', 549 'deb_arch': 'i386',
550 'rpm_arch': 'i386', 550 'rpm_arch': 'i386',
551 'packaging_files_binaries': [ 551 'packaging_files_binaries': [
552 '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe', 552 '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe',
553 '<(PRODUCT_DIR)/nacl_ipc_irt_x86_32.nexe', 553 '<(PRODUCT_DIR)/nacl_irt_srpc_x86_32.nexe',
554 ], 554 ],
555 }], 555 }],
556 ['target_arch=="x64"', { 556 ['target_arch=="x64"', {
557 'deb_arch': 'amd64', 557 'deb_arch': 'amd64',
558 'rpm_arch': 'x86_64', 558 'rpm_arch': 'x86_64',
559 'packaging_files_binaries': [ 559 'packaging_files_binaries': [
560 '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe', 560 '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe',
561 '<(PRODUCT_DIR)/nacl_ipc_irt_x86_64.nexe', 561 '<(PRODUCT_DIR)/nacl_irt_srpc_x86_64.nexe',
562 ], 562 ],
563 }], 563 }],
564 ['target_arch=="arm"', { 564 ['target_arch=="arm"', {
565 'deb_arch': 'arm', 565 'deb_arch': 'arm',
566 'rpm_arch': 'arm', 566 'rpm_arch': 'arm',
567 }], 567 }],
568 ['internal_pdf', { 568 ['internal_pdf', {
569 'packaging_files_binaries': [ 569 'packaging_files_binaries': [
570 '<(PRODUCT_DIR)/libpdf.so', 570 '<(PRODUCT_DIR)/libpdf.so',
571 ], 571 ],
(...skipping 613 matching lines...) Expand 10 before | Expand all | Expand 10 after
1185 'branding_dir_100': 'app/theme/default_100_percent/google_chrome', 1185 'branding_dir_100': 'app/theme/default_100_percent/google_chrome',
1186 }, 1186 },
1187 }, { # else branding!="Chrome" 1187 }, { # else branding!="Chrome"
1188 'variables': { 1188 'variables': {
1189 'branding_dir': 'app/theme/chromium', 1189 'branding_dir': 'app/theme/chromium',
1190 'branding_dir_100': 'app/theme/default_100_percent/chromium', 1190 'branding_dir_100': 'app/theme/default_100_percent/chromium',
1191 }, 1191 },
1192 }], 1192 }],
1193 ], 1193 ],
1194 } 1194 }
OLDNEW
« no previous file with comments | « chrome/chrome_dll.gypi ('k') | chrome/installer/mini_installer.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698