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

Side by Side Diff: chrome/chrome.isolate

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