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

Side by Side Diff: content/content_unittests.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 | « content/content_shell.gypi ('k') | content/renderer/render_thread_impl.cc » ('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 ['use_x11==0', { 6 ['use_x11==0', {
7 'variables': { 7 'variables': {
8 'command': [ 8 'command': [
9 '../testing/test_env.py', 9 '../testing/test_env.py',
10 '<(PRODUCT_DIR)/content_unittests<(EXECUTABLE_SUFFIX)', 10 '<(PRODUCT_DIR)/content_unittests<(EXECUTABLE_SUFFIX)',
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
61 'variables': { 61 'variables': {
62 'files': [ 62 'files': [
63 '../testing/test_env.py', 63 '../testing/test_env.py',
64 '<(PRODUCT_DIR)/content_unittests<(EXECUTABLE_SUFFIX)', 64 '<(PRODUCT_DIR)/content_unittests<(EXECUTABLE_SUFFIX)',
65 ], 65 ],
66 }, 66 },
67 }], 67 }],
68 ['OS=="linux"', { 68 ['OS=="linux"', {
69 'variables': { 69 'variables': {
70 'files': [ 70 'files': [
71 '<(PRODUCT_DIR)/libffmpegsumo.so',
71 '<(PRODUCT_DIR)/libosmesa.so', 72 '<(PRODUCT_DIR)/libosmesa.so',
72 ], 73 ],
73 }, 74 },
74 }], 75 }],
75 ['OS=="mac"', { 76 ['OS=="mac"', {
76 'variables': { 77 'variables': {
77 'files': [ 78 'files': [
79 '<(PRODUCT_DIR)/ffmpegsumo.so',
78 '<(PRODUCT_DIR)/osmesa.so', 80 '<(PRODUCT_DIR)/osmesa.so',
79 ], 81 ],
80 }, 82 },
81 }], 83 }],
82 ['OS=="win"', { 84 ['OS=="win"', {
83 'variables': { 85 'variables': {
84 'files': [ 86 'files': [
87 '<(PRODUCT_DIR)/ffmpegsumo.dll',
85 '<(PRODUCT_DIR)/osmesa.dll', 88 '<(PRODUCT_DIR)/osmesa.dll',
86 ], 89 ],
87 }, 90 },
88 }], 91 }],
89 ['OS=="mac" and asan==1 and fastbuild==0', { 92 ['OS=="mac" and asan==1 and fastbuild==0', {
90 'variables': { 93 'variables': {
91 'files': [ 94 'files': [
92 '<(PRODUCT_DIR)/content_unittests.dSYM/', 95 '<(PRODUCT_DIR)/content_unittests.dSYM/',
96 '<(PRODUCT_DIR)/ffmpegsumo.so.dSYM/',
93 '<(PRODUCT_DIR)/osmesa.so.dSYM/', 97 '<(PRODUCT_DIR)/osmesa.so.dSYM/',
94 ], 98 ],
95 }, 99 },
96 }], 100 }],
97 ['OS=="win" and (fastbuild==0 or fastbuild==1)', { 101 ['OS=="win" and (fastbuild==0 or fastbuild==1)', {
98 'variables': { 102 'variables': {
99 'files': [ 103 'files': [
100 '<(PRODUCT_DIR)/content_unittests.exe.pdb', 104 '<(PRODUCT_DIR)/content_unittests.exe.pdb',
101 ], 105 ],
102 }, 106 },
103 }], 107 }],
104 ], 108 ],
105 'includes': [ 109 'includes': [
106 '../base/base.isolate', 110 '../base/base.isolate',
107 '../gin/v8.isolate', 111 '../gin/v8.isolate',
108 '../third_party/angle/angle.isolate', 112 '../third_party/angle/angle.isolate',
109 ], 113 ],
110 } 114 }
OLDNEW
« no previous file with comments | « content/content_shell.gypi ('k') | content/renderer/render_thread_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698