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

Side by Side Diff: content/content_unittests.isolate

Issue 1179953006: [Merge to M44] Chromium changes to statically link ffmpeg. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2403
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',
72 '<(PRODUCT_DIR)/libosmesa.so', 71 '<(PRODUCT_DIR)/libosmesa.so',
73 ], 72 ],
74 }, 73 },
75 }], 74 }],
76 ['OS=="mac"', { 75 ['OS=="mac"', {
77 'variables': { 76 'variables': {
78 'files': [ 77 'files': [
79 '<(PRODUCT_DIR)/ffmpegsumo.so',
80 '<(PRODUCT_DIR)/osmesa.so', 78 '<(PRODUCT_DIR)/osmesa.so',
81 ], 79 ],
82 }, 80 },
83 }], 81 }],
84 ['OS=="win"', { 82 ['OS=="win"', {
85 'variables': { 83 'variables': {
86 'files': [ 84 'files': [
87 '<(PRODUCT_DIR)/ffmpegsumo.dll',
88 '<(PRODUCT_DIR)/osmesa.dll', 85 '<(PRODUCT_DIR)/osmesa.dll',
89 ], 86 ],
90 }, 87 },
91 }], 88 }],
92 ['OS=="mac" and asan==1 and fastbuild==0', { 89 ['OS=="mac" and asan==1 and fastbuild==0', {
93 'variables': { 90 'variables': {
94 'files': [ 91 'files': [
95 '<(PRODUCT_DIR)/content_unittests.dSYM/', 92 '<(PRODUCT_DIR)/content_unittests.dSYM/',
96 '<(PRODUCT_DIR)/ffmpegsumo.so.dSYM/',
97 '<(PRODUCT_DIR)/osmesa.so.dSYM/', 93 '<(PRODUCT_DIR)/osmesa.so.dSYM/',
98 ], 94 ],
99 }, 95 },
100 }], 96 }],
101 ['OS=="win" and (fastbuild==0 or fastbuild==1)', { 97 ['OS=="win" and (fastbuild==0 or fastbuild==1)', {
102 'variables': { 98 'variables': {
103 'files': [ 99 'files': [
104 '<(PRODUCT_DIR)/content_unittests.exe.pdb', 100 '<(PRODUCT_DIR)/content_unittests.exe.pdb',
105 ], 101 ],
106 }, 102 },
107 }], 103 }],
108 ], 104 ],
109 'includes': [ 105 'includes': [
110 '../base/base.isolate', 106 '../base/base.isolate',
111 '../gin/v8.isolate', 107 '../gin/v8.isolate',
112 '../third_party/angle/angle.isolate', 108 '../third_party/angle/angle.isolate',
113 ], 109 ],
114 } 110 }
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