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

Side by Side Diff: content/content_shell.gypi

Issue 1179953006: [Merge to M44] Chromium changes to statically link ffmpeg. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2403
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 857 matching lines...) Expand 10 before | Expand all | Expand 10 after
868 'action': ['../build/mac/tweak_info_plist.py', 868 'action': ['../build/mac/tweak_info_plist.py',
869 '--breakpad=1', 869 '--breakpad=1',
870 '--keystone=0', 870 '--keystone=0',
871 '--scm=1', 871 '--scm=1',
872 '--version=<(content_shell_version)', 872 '--version=<(content_shell_version)',
873 '--branding=<(content_shell_product_name)'], 873 '--branding=<(content_shell_product_name)'],
874 }, 874 },
875 ], 875 ],
876 'copies': [ 876 'copies': [
877 { 877 {
878 # Copy FFmpeg binaries for audio/video support.
879 'destination': '<(PRODUCT_DIR)/$(CONTENTS_FOLDER_PATH)/Libraries',
880 'files': [
881 '<(PRODUCT_DIR)/ffmpegsumo.so',
882 ],
883 },
884 {
885 'destination': '<(PRODUCT_DIR)/$(CONTENTS_FOLDER_PATH)/Resources', 878 'destination': '<(PRODUCT_DIR)/$(CONTENTS_FOLDER_PATH)/Resources',
886 'files': [ 879 'files': [
887 '<(PRODUCT_DIR)/crash_inspector', 880 '<(PRODUCT_DIR)/crash_inspector',
888 '<(PRODUCT_DIR)/crash_report_sender.app' 881 '<(PRODUCT_DIR)/crash_report_sender.app'
889 ], 882 ],
890 }, 883 },
891 ], 884 ],
892 'conditions': [ 885 'conditions': [
893 ['enable_webrtc==1', { 886 ['enable_webrtc==1', {
894 'variables': { 887 'variables': {
(...skipping 273 matching lines...) Expand 10 before | Expand all | Expand 10 after
1168 '--input_symbol', '<(PRODUCT_DIR)/content_shell.exe.pdb', 1161 '--input_symbol', '<(PRODUCT_DIR)/content_shell.exe.pdb',
1169 '--destination_dir', '<(dest_dir)', 1162 '--destination_dir', '<(dest_dir)',
1170 ], 1163 ],
1171 }, 1164 },
1172 ], 1165 ],
1173 }, 1166 },
1174 ], 1167 ],
1175 }], # OS=="win" and fastbuild==0 and target_arch=="ia32" 1168 }], # OS=="win" and fastbuild==0 and target_arch=="ia32"
1176 ] 1169 ]
1177 } 1170 }
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