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

Side by Side Diff: content/content_shell.gypi

Issue 1161183003: Revert "Chromium changes to statically link ffmpeg." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 | « content/content_gl_tests.isolate ('k') | content/content_unittests.isolate » ('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 'content_shell_product_name': 'Content Shell', 7 'content_shell_product_name': 'Content Shell',
8 # The "19" is so that sites that sniff for version think that this is 8 # The "19" is so that sites that sniff for version think that this is
9 # something reasonably current; the "77.34.5" is a hint that this isn't a 9 # something reasonably current; the "77.34.5" is a hint that this isn't a
10 # standard Chrome. 10 # standard Chrome.
(...skipping 749 matching lines...) Expand 10 before | Expand all | Expand 10 after
760 'action': ['../build/mac/tweak_info_plist.py', 760 'action': ['../build/mac/tweak_info_plist.py',
761 '--breakpad=1', 761 '--breakpad=1',
762 '--keystone=0', 762 '--keystone=0',
763 '--scm=1', 763 '--scm=1',
764 '--version=<(content_shell_version)', 764 '--version=<(content_shell_version)',
765 '--branding=<(content_shell_product_name)'], 765 '--branding=<(content_shell_product_name)'],
766 }, 766 },
767 ], 767 ],
768 'copies': [ 768 'copies': [
769 { 769 {
770 # Copy FFmpeg binaries for audio/video support.
771 'destination': '<(PRODUCT_DIR)/$(CONTENTS_FOLDER_PATH)/Libraries',
772 'files': [
773 '<(PRODUCT_DIR)/ffmpegsumo.so',
774 ],
775 },
776 {
770 'destination': '<(PRODUCT_DIR)/$(CONTENTS_FOLDER_PATH)/Resources', 777 'destination': '<(PRODUCT_DIR)/$(CONTENTS_FOLDER_PATH)/Resources',
771 'files': [ 778 'files': [
772 '<(PRODUCT_DIR)/crash_inspector', 779 '<(PRODUCT_DIR)/crash_inspector',
773 '<(PRODUCT_DIR)/crash_report_sender.app' 780 '<(PRODUCT_DIR)/crash_report_sender.app'
774 ], 781 ],
775 }, 782 },
776 ], 783 ],
777 'conditions': [ 784 'conditions': [
778 ['enable_webrtc==1', { 785 ['enable_webrtc==1', {
779 'variables': { 786 'variables': {
(...skipping 272 matching lines...) Expand 10 before | Expand all | Expand 10 after
1052 '--input_symbol', '<(PRODUCT_DIR)/content_shell.exe.pdb', 1059 '--input_symbol', '<(PRODUCT_DIR)/content_shell.exe.pdb',
1053 '--destination_dir', '<(dest_dir)', 1060 '--destination_dir', '<(dest_dir)',
1054 ], 1061 ],
1055 }, 1062 },
1056 ], 1063 ],
1057 }, 1064 },
1058 ], 1065 ],
1059 }], # OS=="win" and fastbuild==0 and target_arch=="ia32" 1066 }], # OS=="win" and fastbuild==0 and target_arch=="ia32"
1060 ] 1067 ]
1061 } 1068 }
OLDNEW
« no previous file with comments | « content/content_gl_tests.isolate ('k') | content/content_unittests.isolate » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698