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

Side by Side Diff: content/content_shell.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 | « 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 751 matching lines...) Expand 10 before | Expand all | Expand 10 after
762 'action': ['../build/mac/tweak_info_plist.py', 762 'action': ['../build/mac/tweak_info_plist.py',
763 '--breakpad=1', 763 '--breakpad=1',
764 '--keystone=0', 764 '--keystone=0',
765 '--scm=1', 765 '--scm=1',
766 '--version=<(content_shell_version)', 766 '--version=<(content_shell_version)',
767 '--branding=<(content_shell_product_name)'], 767 '--branding=<(content_shell_product_name)'],
768 }, 768 },
769 ], 769 ],
770 'copies': [ 770 'copies': [
771 { 771 {
772 # Copy FFmpeg binaries for audio/video support.
773 'destination': '<(PRODUCT_DIR)/$(CONTENTS_FOLDER_PATH)/Libraries',
774 'files': [
775 '<(PRODUCT_DIR)/ffmpegsumo.so',
776 ],
777 },
778 {
779 'destination': '<(PRODUCT_DIR)/$(CONTENTS_FOLDER_PATH)/Resources', 772 'destination': '<(PRODUCT_DIR)/$(CONTENTS_FOLDER_PATH)/Resources',
780 'files': [ 773 'files': [
781 '<(PRODUCT_DIR)/crash_inspector', 774 '<(PRODUCT_DIR)/crash_inspector',
782 '<(PRODUCT_DIR)/crash_report_sender.app' 775 '<(PRODUCT_DIR)/crash_report_sender.app'
783 ], 776 ],
784 }, 777 },
785 ], 778 ],
786 'conditions': [ 779 'conditions': [
787 ['enable_webrtc==1', { 780 ['enable_webrtc==1', {
788 'variables': { 781 'variables': {
(...skipping 272 matching lines...) Expand 10 before | Expand all | Expand 10 after
1061 '--input_symbol', '<(PRODUCT_DIR)/content_shell.exe.pdb', 1054 '--input_symbol', '<(PRODUCT_DIR)/content_shell.exe.pdb',
1062 '--destination_dir', '<(dest_dir)', 1055 '--destination_dir', '<(dest_dir)',
1063 ], 1056 ],
1064 }, 1057 },
1065 ], 1058 ],
1066 }, 1059 },
1067 ], 1060 ],
1068 }], # OS=="win" and fastbuild==0 and target_arch=="ia32" 1061 }], # OS=="win" and fastbuild==0 and target_arch=="ia32"
1069 ] 1062 ]
1070 } 1063 }
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