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

Side by Side Diff: chrome/chrome.isolate

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 | « cc/trees/layer_tree_host_unittest_context.cc ('k') | chrome/chrome_dll_bundle.gypi » ('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) 2013 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2013 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 'conditions': [ 5 'conditions': [
6 ['OS=="linux"', { 6 ['OS=="linux"', {
7 'variables': { 7 'variables': {
8 'files': [ 8 'files': [
9 '<(PRODUCT_DIR)/libffmpegsumo.so',
9 '<(PRODUCT_DIR)/libosmesa.so', 10 '<(PRODUCT_DIR)/libosmesa.so',
10 ], 11 ],
11 }, 12 },
12 }], 13 }],
13 ['disable_nacl==0 and OS=="linux"', { 14 ['disable_nacl==0 and OS=="linux"', {
14 'variables': { 15 'variables': {
15 'files': [ 16 'files': [
16 '<(PRODUCT_DIR)/nacl_helper<(EXECUTABLE_SUFFIX)', 17 '<(PRODUCT_DIR)/nacl_helper<(EXECUTABLE_SUFFIX)',
17 '<(PRODUCT_DIR)/nacl_helper_bootstrap<(EXECUTABLE_SUFFIX)', 18 '<(PRODUCT_DIR)/nacl_helper_bootstrap<(EXECUTABLE_SUFFIX)',
18 ] 19 ]
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 ['OS=="mac"', { 64 ['OS=="mac"', {
64 'variables': { 65 'variables': {
65 'command': [ 66 'command': [
66 '<(PRODUCT_DIR)/<(mac_product_name).app/Contents/MacOS/<(mac_product_n ame)', 67 '<(PRODUCT_DIR)/<(mac_product_name).app/Contents/MacOS/<(mac_product_n ame)',
67 ], 68 ],
68 'files': [ 69 'files': [
69 '<(PRODUCT_DIR)/<(mac_product_name) Framework.framework/', 70 '<(PRODUCT_DIR)/<(mac_product_name) Framework.framework/',
70 '<(PRODUCT_DIR)/<(mac_product_name) Helper.app/', 71 '<(PRODUCT_DIR)/<(mac_product_name) Helper.app/',
71 '<(PRODUCT_DIR)/<(mac_product_name).app/', 72 '<(PRODUCT_DIR)/<(mac_product_name).app/',
72 '<(PRODUCT_DIR)/exif.so', 73 '<(PRODUCT_DIR)/exif.so',
74 '<(PRODUCT_DIR)/ffmpegsumo.so',
73 ], 75 ],
74 }, 76 },
75 }], 77 }],
76 ['OS=="mac" and asan==1 and fastbuild==0', { 78 ['OS=="mac" and asan==1 and fastbuild==0', {
77 'variables': { 79 'variables': {
78 'files': [ 80 'files': [
79 '<(PRODUCT_DIR)/<(mac_product_name) Framework.framework.dSYM/', 81 '<(PRODUCT_DIR)/<(mac_product_name) Framework.framework.dSYM/',
80 '<(PRODUCT_DIR)/<(mac_product_name) Helper.app.dSYM/', 82 '<(PRODUCT_DIR)/<(mac_product_name) Helper.app.dSYM/',
81 '<(PRODUCT_DIR)/<(mac_product_name).app.dSYM/', 83 '<(PRODUCT_DIR)/<(mac_product_name).app.dSYM/',
82 '<(PRODUCT_DIR)/exif.so.dSYM/', 84 '<(PRODUCT_DIR)/exif.so.dSYM/',
85 '<(PRODUCT_DIR)/ffmpegsumo.so.dSYM/',
83 ], 86 ],
84 }, 87 },
85 }], 88 }],
86 ['OS=="win"', { 89 ['OS=="win"', {
87 'variables': { 90 'variables': {
88 'files': [ 91 'files': [
89 '<(PRODUCT_DIR)/<(version_full).manifest', 92 '<(PRODUCT_DIR)/<(version_full).manifest',
90 '<(PRODUCT_DIR)/chrome_200_percent.pak', 93 '<(PRODUCT_DIR)/chrome_200_percent.pak',
91 '<(PRODUCT_DIR)/chrome.dll', 94 '<(PRODUCT_DIR)/chrome.dll',
92 '<(PRODUCT_DIR)/chrome_elf.dll', 95 '<(PRODUCT_DIR)/chrome_elf.dll',
96 '<(PRODUCT_DIR)/ffmpegsumo.dll',
93 '<(PRODUCT_DIR)/libexif.dll', 97 '<(PRODUCT_DIR)/libexif.dll',
94 '<(PRODUCT_DIR)/osmesa.dll', 98 '<(PRODUCT_DIR)/osmesa.dll',
95 ], 99 ],
96 }, 100 },
97 }], 101 }],
98 ['OS=="win" and target_arch=="ia32"', { 102 ['OS=="win" and target_arch=="ia32"', {
99 'variables': { 103 'variables': {
100 'files': [ 104 'files': [
101 '<(PRODUCT_DIR)/wow_helper.exe', 105 '<(PRODUCT_DIR)/wow_helper.exe',
102 ], 106 ],
(...skipping 21 matching lines...) Expand all
124 ], 128 ],
125 }, 129 },
126 }], 130 }],
127 ], 131 ],
128 'includes': [ 132 'includes': [
129 '../base/base.isolate', 133 '../base/base.isolate',
130 '../third_party/angle/angle.isolate', 134 '../third_party/angle/angle.isolate',
131 '../gin/v8.isolate', 135 '../gin/v8.isolate',
132 ], 136 ],
133 } 137 }
OLDNEW
« no previous file with comments | « cc/trees/layer_tree_host_unittest_context.cc ('k') | chrome/chrome_dll_bundle.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698