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

Side by Side Diff: chrome/chrome_installer.gypi

Issue 6927015: NaCl: Add the integrated runtime (IRT) library to install images (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 7 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
« 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) 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 407 matching lines...) Expand 10 before | Expand all | Expand 10 after
418 'rpm_cmd': ['<@(flock_bash)', '<(rpm_build)', '-o' '<(PRODUCT_DIR)', 418 'rpm_cmd': ['<@(flock_bash)', '<(rpm_build)', '-o' '<(PRODUCT_DIR)',
419 '-b', '<(PRODUCT_DIR)', '-a', '<(target_arch)'], 419 '-b', '<(PRODUCT_DIR)', '-a', '<(target_arch)'],
420 'conditions': [ 420 'conditions': [
421 ['target_arch=="ia32"', { 421 ['target_arch=="ia32"', {
422 'deb_arch': 'i386', 422 'deb_arch': 'i386',
423 'rpm_arch': 'i386', 423 'rpm_arch': 'i386',
424 # Flash Player for Linux is currently only available for ia32. 424 # Flash Player for Linux is currently only available for ia32.
425 'packaging_files_binaries': [ 425 'packaging_files_binaries': [
426 '<(PRODUCT_DIR)/libgcflashplayer.so', 426 '<(PRODUCT_DIR)/libgcflashplayer.so',
427 '<(PRODUCT_DIR)/plugin.vch', 427 '<(PRODUCT_DIR)/plugin.vch',
428 '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe',
428 ], 429 ],
429 }], 430 }],
430 ['target_arch=="x64"', { 431 ['target_arch=="x64"', {
431 'deb_arch': 'amd64', 432 'deb_arch': 'amd64',
432 'rpm_arch': 'x86_64', 433 'rpm_arch': 'x86_64',
434 'packaging_files_binaries': [
435 '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe',
436 ],
433 }], 437 }],
434 ['target_arch=="arm"', { 438 ['target_arch=="arm"', {
435 'deb_arch': 'arm', 439 'deb_arch': 'arm',
436 'rpm_arch': 'arm', 440 'rpm_arch': 'arm',
437 }], 441 }],
438 ['internal_pdf', { 442 ['internal_pdf', {
439 'packaging_files_binaries': [ 443 'packaging_files_binaries': [
440 '<(PRODUCT_DIR)/libpdf.so', 444 '<(PRODUCT_DIR)/libpdf.so',
441 ], 445 ],
442 }], 446 }],
(...skipping 473 matching lines...) Expand 10 before | Expand all | Expand 10 after
916 }, 920 },
917 }], 921 }],
918 ], 922 ],
919 } 923 }
920 924
921 # Local Variables: 925 # Local Variables:
922 # tab-width:2 926 # tab-width:2
923 # indent-tabs-mode:nil 927 # indent-tabs-mode:nil
924 # End: 928 # End:
925 # vim: set expandtab tabstop=2 shiftwidth=2: 929 # vim: set expandtab tabstop=2 shiftwidth=2:
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