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

Side by Side Diff: chrome/chrome_installer.gypi

Issue 1141703002: Chromium changes for static linking ffmpeg (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Roll DEPS to fix cros, rebase. Created 5 years, 6 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_dll_bundle.gypi ('k') | chrome/installer/linux/common/installer.include » ('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 'libpeer_target_type%': 'static_library', 8 'libpeer_target_type%': 'static_library',
9 'branding_dir': 'app/theme/<(branding_path_component)', 9 'branding_dir': 'app/theme/<(branding_path_component)',
10 'branding_dir_100': 'app/theme/default_100_percent/<(branding_path_component )', 10 'branding_dir_100': 'app/theme/default_100_percent/<(branding_path_component )',
(...skipping 420 matching lines...) Expand 10 before | Expand all | Expand 10 after
431 'installer/linux/rpm/build.sh', 431 'installer/linux/rpm/build.sh',
432 'installer/linux/rpm/chrome.spec.template', 432 'installer/linux/rpm/chrome.spec.template',
433 'installer/linux/rpm/expected_deps_i386', 433 'installer/linux/rpm/expected_deps_i386',
434 'installer/linux/rpm/expected_deps_x86_64', 434 'installer/linux/rpm/expected_deps_x86_64',
435 ], 435 ],
436 'packaging_files_binaries': [ 436 'packaging_files_binaries': [
437 # TODO(mmoss) Any convenient way to get all the relevant build 437 # TODO(mmoss) Any convenient way to get all the relevant build
438 # files? (e.g. all locales, resources, etc.) 438 # files? (e.g. all locales, resources, etc.)
439 '<(PRODUCT_DIR)/chrome', 439 '<(PRODUCT_DIR)/chrome',
440 '<(PRODUCT_DIR)/chrome_sandbox', 440 '<(PRODUCT_DIR)/chrome_sandbox',
441 '<(PRODUCT_DIR)/libffmpegsumo.so',
442 '<(PRODUCT_DIR)/xdg-mime', 441 '<(PRODUCT_DIR)/xdg-mime',
443 '<(PRODUCT_DIR)/xdg-settings', 442 '<(PRODUCT_DIR)/xdg-settings',
444 '<(PRODUCT_DIR)/locales/en-US.pak', 443 '<(PRODUCT_DIR)/locales/en-US.pak',
445 '<(PRODUCT_DIR)/nacl_helper', 444 '<(PRODUCT_DIR)/nacl_helper',
446 '<(PRODUCT_DIR)/nacl_helper_bootstrap', 445 '<(PRODUCT_DIR)/nacl_helper_bootstrap',
447 '<(PRODUCT_DIR)/PepperFlash/libpepflashplayer.so', 446 '<(PRODUCT_DIR)/PepperFlash/libpepflashplayer.so',
448 '<(PRODUCT_DIR)/PepperFlash/manifest.json', 447 '<(PRODUCT_DIR)/PepperFlash/manifest.json',
449 '<@(default_apps_list_linux_dest)', 448 '<@(default_apps_list_linux_dest)',
450 ], 449 ],
451 'flock_bash': ['flock', '--', '/tmp/linux_package_lock', 'bash'], 450 'flock_bash': ['flock', '--', '/tmp/linux_package_lock', 'bash'],
(...skipping 612 matching lines...) Expand 10 before | Expand all | Expand 10 after
1064 '..', 1063 '..',
1065 ], 1064 ],
1066 'sources': [ 1065 'sources': [
1067 'installer/gcapi_mac/gcapi_example_client.mm', 1066 'installer/gcapi_mac/gcapi_example_client.mm',
1068 ], 1067 ],
1069 }, 1068 },
1070 ], # targets 1069 ], # targets
1071 }], # OS=="mac" 1070 }], # OS=="mac"
1072 ], 1071 ],
1073 } 1072 }
OLDNEW
« no previous file with comments | « chrome/chrome_dll_bundle.gypi ('k') | chrome/installer/linux/common/installer.include » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698