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

Side by Side Diff: chrome/unit_tests.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 | « chrome/tools/build/win/FILES.cfg ('k') | chrome/utility/extensions/extensions_handler.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) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 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)/unit_tests<(EXECUTABLE_SUFFIX)', 10 '<(PRODUCT_DIR)/unit_tests<(EXECUTABLE_SUFFIX)',
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
66 'variables': { 66 'variables': {
67 'files': [ 67 'files': [
68 '<(PRODUCT_DIR)/chrome_100_percent.pak', 68 '<(PRODUCT_DIR)/chrome_100_percent.pak',
69 '<(PRODUCT_DIR)/locales/en-US.pak', 69 '<(PRODUCT_DIR)/locales/en-US.pak',
70 ], 70 ],
71 }, 71 },
72 }], 72 }],
73 ['OS=="linux"', { 73 ['OS=="linux"', {
74 'variables': { 74 'variables': {
75 'files': [ 75 'files': [
76 '<(PRODUCT_DIR)/libffmpegsumo.so',
76 '<(PRODUCT_DIR)/libosmesa.so', 77 '<(PRODUCT_DIR)/libosmesa.so',
77 '<(PRODUCT_DIR)/locales/fr.pak', 78 '<(PRODUCT_DIR)/locales/fr.pak',
78 ], 79 ],
79 }, 80 },
80 }], 81 }],
81 ['OS=="linux" or OS=="mac" or OS=="win"', { 82 ['OS=="linux" or OS=="mac" or OS=="win"', {
82 'variables': { 83 'variables': {
83 'files': [ 84 'files': [
84 '../net/tools/testserver/', 85 '../net/tools/testserver/',
85 '../testing/test_env.py', 86 '../testing/test_env.py',
86 '../third_party/pyftpdlib/', 87 '../third_party/pyftpdlib/',
87 '../third_party/pywebsocket/', 88 '../third_party/pywebsocket/',
88 '../third_party/tlslite/', 89 '../third_party/tlslite/',
89 '<(PRODUCT_DIR)/pyproto/google/', 90 '<(PRODUCT_DIR)/pyproto/google/',
90 '<(PRODUCT_DIR)/unit_tests<(EXECUTABLE_SUFFIX)', 91 '<(PRODUCT_DIR)/unit_tests<(EXECUTABLE_SUFFIX)',
91 ], 92 ],
92 }, 93 },
93 }], 94 }],
94 ['OS=="linux" or OS=="mac"', { 95 ['OS=="linux" or OS=="mac"', {
95 'variables': { 96 'variables': {
96 'read_only': 1, 97 'read_only': 1,
97 }, 98 },
98 }], 99 }],
99 ['OS=="mac"', { 100 ['OS=="mac"', {
100 'variables': { 101 'variables': {
101 'files': [ 102 'files': [
102 '<(PRODUCT_DIR)/<(mac_product_name) Framework.framework/', 103 '<(PRODUCT_DIR)/<(mac_product_name) Framework.framework/',
103 '<(PRODUCT_DIR)/exif.so', 104 '<(PRODUCT_DIR)/exif.so',
105 '<(PRODUCT_DIR)/ffmpegsumo.so',
104 '<(PRODUCT_DIR)/osmesa.so', 106 '<(PRODUCT_DIR)/osmesa.so',
105 ], 107 ],
106 }, 108 },
107 }], 109 }],
108 ['OS=="mac" and asan==1 and fastbuild==0', { 110 ['OS=="mac" and asan==1 and fastbuild==0', {
109 'variables': { 111 'variables': {
110 'files': [ 112 'files': [
111 '<(PRODUCT_DIR)/<(mac_product_name) Framework.framework.dSYM/', 113 '<(PRODUCT_DIR)/<(mac_product_name) Framework.framework.dSYM/',
112 '<(PRODUCT_DIR)/exif.so.dSYM/', 114 '<(PRODUCT_DIR)/exif.so.dSYM/',
115 '<(PRODUCT_DIR)/ffmpegsumo.so.dSYM/',
113 '<(PRODUCT_DIR)/osmesa.so.dSYM/', 116 '<(PRODUCT_DIR)/osmesa.so.dSYM/',
114 '<(PRODUCT_DIR)/unit_tests.dSYM/', 117 '<(PRODUCT_DIR)/unit_tests.dSYM/',
115 ], 118 ],
116 }, 119 },
117 }], 120 }],
118 ['OS=="win"', { 121 ['OS=="win"', {
119 'variables': { 122 'variables': {
120 'files': [ 123 'files': [
121 '../ppapi/lib/gl/include/KHR/', 124 '../ppapi/lib/gl/include/KHR/',
122 '../skia/ext/data/', 125 '../skia/ext/data/',
123 '../ui/base/glib/', 126 '../ui/base/glib/',
124 '<(PRODUCT_DIR)/blacklist_test_dll_1.dll', 127 '<(PRODUCT_DIR)/blacklist_test_dll_1.dll',
125 '<(PRODUCT_DIR)/chrome_elf.dll', 128 '<(PRODUCT_DIR)/chrome_elf.dll',
129 '<(PRODUCT_DIR)/ffmpegsumo.dll',
126 '<(PRODUCT_DIR)/libexif.dll', 130 '<(PRODUCT_DIR)/libexif.dll',
127 '<(PRODUCT_DIR)/osmesa.dll', 131 '<(PRODUCT_DIR)/osmesa.dll',
128 '<(PRODUCT_DIR)/verifier_test_dll_1.dll', 132 '<(PRODUCT_DIR)/verifier_test_dll_1.dll',
129 '<(PRODUCT_DIR)/verifier_test_dll_2.dll', 133 '<(PRODUCT_DIR)/verifier_test_dll_2.dll',
130 'test/data/safe_browsing/signed_binary.dll', 134 'test/data/safe_browsing/signed_binary.dll',
131 ], 135 ],
132 # Can't be enabled on Windows due to http://crbug.com/342913 136 # Can't be enabled on Windows due to http://crbug.com/342913
133 'read_only': 0, 137 'read_only': 0,
134 }, 138 },
135 }], 139 }],
(...skipping 20 matching lines...) Expand all
156 ], 160 ],
157 }, 161 },
158 }], 162 }],
159 ], 163 ],
160 'includes': [ 164 'includes': [
161 '../base/base.isolate', 165 '../base/base.isolate',
162 '../gin/v8.isolate', 166 '../gin/v8.isolate',
163 '../third_party/angle/angle.isolate', 167 '../third_party/angle/angle.isolate',
164 ], 168 ],
165 } 169 }
OLDNEW
« no previous file with comments | « chrome/tools/build/win/FILES.cfg ('k') | chrome/utility/extensions/extensions_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698