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

Side by Side Diff: chrome/installer/installer.gyp

Issue 215016: Update ffmpeg binaries directories to support variants based off the target architecture. (Closed)
Patch Set: Fix linux installer. Created 11 years, 3 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
« no previous file with comments | « chrome/chrome.gyp ('k') | third_party/ffmpeg/ffmpeg.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 { 1 {
2 'variables': { 2 'variables': {
3 'version_py': '../../chrome/tools/build/version.py', 3 'version_py': '../../chrome/tools/build/version.py',
4 'version_path': '../../chrome/VERSION', 4 'version_path': '../../chrome/VERSION',
5 'lastchange_path': '<(SHARED_INTERMEDIATE_DIR)/build/LASTCHANGE', 5 'lastchange_path': '<(SHARED_INTERMEDIATE_DIR)/build/LASTCHANGE',
6 # 'branding_dir' is set in the 'conditions' section at the bottom. 6 # 'branding_dir' is set in the 'conditions' section at the bottom.
7 }, 7 },
8 'conditions': [ 8 'conditions': [
9 ['OS=="win"', { 9 ['OS=="win"', {
10 'targets': [ 10 'targets': [
(...skipping 488 matching lines...) Expand 10 before | Expand all | Expand 10 after
499 'rpm_cmd': ['bash', '<(rpm_build)', '-o' '<(PRODUCT_DIR)', 499 'rpm_cmd': ['bash', '<(rpm_build)', '-o' '<(PRODUCT_DIR)',
500 '-b', '<(PRODUCT_DIR)', '-a', '<(target_arch)'], 500 '-b', '<(PRODUCT_DIR)', '-a', '<(target_arch)'],
501 'conditions': [ 501 'conditions': [
502 ['target_arch=="ia32"', { 502 ['target_arch=="ia32"', {
503 'deb_arch': 'i386', 503 'deb_arch': 'i386',
504 'rpm_arch': 'i386', 504 'rpm_arch': 'i386',
505 }], 505 }],
506 ['target_arch=="x64"', { 506 ['target_arch=="x64"', {
507 'deb_arch': 'amd64', 507 'deb_arch': 'amd64',
508 'rpm_arch': 'x86_64', 508 'rpm_arch': 'x86_64',
509 # TODO(mmoss) The ffmpeg libs are currently 32-bit only. Once
510 # we have 64-bit, this will need to copy the correct versions
511 # to the build output.
512 'input_files!': [
513 '<(PRODUCT_DIR)/libavcodec.so.52',
514 '<(PRODUCT_DIR)/libavformat.so.52',
515 '<(PRODUCT_DIR)/libavutil.so.50',
516 ],
517 }], 509 }],
518 ], 510 ],
519 }, 511 },
520 'actions': [ 512 'actions': [
521 # TODO(mmoss) gyp looping construct would be handy here ... 513 # TODO(mmoss) gyp looping construct would be handy here ...
522 # These deb_packages* and rpm_packages* actions are the same except 514 # These deb_packages* and rpm_packages* actions are the same except
523 # for the 'channel' variable. 515 # for the 'channel' variable.
524 { 516 {
525 'variables': { 517 'variables': {
526 'channel': 'unstable', 518 'channel': 'unstable',
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
631 'variables': { 623 'variables': {
632 'branding_dir': '../app/theme/google_chrome', 624 'branding_dir': '../app/theme/google_chrome',
633 }, 625 },
634 }, { # else branding!="Chrome" 626 }, { # else branding!="Chrome"
635 'variables': { 627 'variables': {
636 'branding_dir': '../app/theme/chromium', 628 'branding_dir': '../app/theme/chromium',
637 }, 629 },
638 }], 630 }],
639 ], 631 ],
640 } 632 }
OLDNEW
« no previous file with comments | « chrome/chrome.gyp ('k') | third_party/ffmpeg/ffmpeg.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698