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

Side by Side Diff: content/content_gl_tests.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 | « content/content_browsertests.isolate ('k') | content/content_shell.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 2013 The Chromium Authors. All rights reserved. 1 # Copyright 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=="android" or OS=="linux" or OS=="mac" or OS=="win"', { 6 ['OS=="android" or OS=="linux" or OS=="mac" or OS=="win"', {
7 'variables': { 7 'variables': {
8 'command': [ 8 'command': [
9 '<(PRODUCT_DIR)/content_gl_tests<(EXECUTABLE_SUFFIX)', 9 '<(PRODUCT_DIR)/content_gl_tests<(EXECUTABLE_SUFFIX)',
10 ], 10 ],
11 'files': [ 11 'files': [
12 '<(PRODUCT_DIR)/content_gl_tests<(EXECUTABLE_SUFFIX)', 12 '<(PRODUCT_DIR)/content_gl_tests<(EXECUTABLE_SUFFIX)',
13 ], 13 ],
14 }, 14 },
15 }], 15 }],
16 # TODO(kbr): these two dependencies seem to be necessary when 16 # TODO(kbr): these two dependencies seem to be necessary when
17 # running the component build to avoid "Failed to mmap datapack" 17 # running the component build to avoid "Failed to mmap datapack"
18 # errors. Should investigate further. 18 # errors. Should investigate further.
19 ['OS=="linux" or OS=="win"', { 19 ['OS=="linux" or OS=="win"', {
20 'variables': { 20 'variables': {
21 'files': [ 21 'files': [
22 '<(PRODUCT_DIR)/content_resources.pak', 22 '<(PRODUCT_DIR)/content_resources.pak',
23 '<(PRODUCT_DIR)/ui_test.pak', 23 '<(PRODUCT_DIR)/ui_test.pak',
24 ], 24 ],
25 }, 25 },
26 }], 26 }],
27 ['OS=="linux"', {
28 'variables': {
29 'files': [
30 '<(PRODUCT_DIR)/libffmpegsumo.so',
31 ],
32 },
33 }],
34 ['OS=="mac"', {
35 'variables': {
36 'files': [
37 '<(PRODUCT_DIR)/ffmpegsumo.so',
38 ],
39 },
40 }],
41 ['OS=="win"', { 27 ['OS=="win"', {
42 'variables': { 28 'variables': {
43 'files': [ 29 'files': [
44 '<(PRODUCT_DIR)/d3dcompiler_47.dll', 30 '<(PRODUCT_DIR)/d3dcompiler_47.dll',
45 '<(PRODUCT_DIR)/libEGL.dll', 31 '<(PRODUCT_DIR)/libEGL.dll',
46 '<(PRODUCT_DIR)/libGLESv2.dll', 32 '<(PRODUCT_DIR)/libGLESv2.dll',
47 '<(PRODUCT_DIR)/ffmpegsumo.dll',
48 '<(PRODUCT_DIR)/osmesa.dll', 33 '<(PRODUCT_DIR)/osmesa.dll',
49 ], 34 ],
50 }, 35 },
51 }], 36 }],
52 ], 37 ],
53 'includes': [ 38 'includes': [
54 '../base/base.isolate', 39 '../base/base.isolate',
55 '../gin/v8.isolate', 40 '../gin/v8.isolate',
56 ], 41 ],
57 } 42 }
OLDNEW
« no previous file with comments | « content/content_browsertests.isolate ('k') | content/content_shell.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698