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

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