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

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: Tweaking our x86inc.asm Created 5 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
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 417 matching lines...) Expand 10 before | Expand all | Expand 10 after
428 'installer/linux/rpm/build.sh', 428 'installer/linux/rpm/build.sh',
429 'installer/linux/rpm/chrome.spec.template', 429 'installer/linux/rpm/chrome.spec.template',
430 'installer/linux/rpm/expected_deps_i386', 430 'installer/linux/rpm/expected_deps_i386',
431 'installer/linux/rpm/expected_deps_x86_64', 431 'installer/linux/rpm/expected_deps_x86_64',
432 ], 432 ],
433 'packaging_files_binaries': [ 433 'packaging_files_binaries': [
434 # TODO(mmoss) Any convenient way to get all the relevant build 434 # TODO(mmoss) Any convenient way to get all the relevant build
435 # files? (e.g. all locales, resources, etc.) 435 # files? (e.g. all locales, resources, etc.)
436 '<(PRODUCT_DIR)/chrome', 436 '<(PRODUCT_DIR)/chrome',
437 '<(PRODUCT_DIR)/chrome_sandbox', 437 '<(PRODUCT_DIR)/chrome_sandbox',
438 '<(PRODUCT_DIR)/libffmpegsumo.so',
439 '<(PRODUCT_DIR)/xdg-mime', 438 '<(PRODUCT_DIR)/xdg-mime',
440 '<(PRODUCT_DIR)/xdg-settings', 439 '<(PRODUCT_DIR)/xdg-settings',
441 '<(PRODUCT_DIR)/locales/en-US.pak', 440 '<(PRODUCT_DIR)/locales/en-US.pak',
442 '<(PRODUCT_DIR)/nacl_helper', 441 '<(PRODUCT_DIR)/nacl_helper',
443 '<(PRODUCT_DIR)/nacl_helper_bootstrap', 442 '<(PRODUCT_DIR)/nacl_helper_bootstrap',
444 '<(PRODUCT_DIR)/PepperFlash/libpepflashplayer.so', 443 '<(PRODUCT_DIR)/PepperFlash/libpepflashplayer.so',
445 '<(PRODUCT_DIR)/PepperFlash/manifest.json', 444 '<(PRODUCT_DIR)/PepperFlash/manifest.json',
446 '<@(default_apps_list_linux_dest)', 445 '<@(default_apps_list_linux_dest)',
447 ], 446 ],
448 'flock_bash': ['flock', '--', '/tmp/linux_package_lock', 'bash'], 447 'flock_bash': ['flock', '--', '/tmp/linux_package_lock', 'bash'],
(...skipping 612 matching lines...) Expand 10 before | Expand all | Expand 10 after
1061 '..', 1060 '..',
1062 ], 1061 ],
1063 'sources': [ 1062 'sources': [
1064 'installer/gcapi_mac/gcapi_example_client.mm', 1063 'installer/gcapi_mac/gcapi_example_client.mm',
1065 ], 1064 ],
1066 }, 1065 },
1067 ], # targets 1066 ], # targets
1068 }], # OS=="mac" 1067 }], # OS=="mac"
1069 ], 1068 ],
1070 } 1069 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698