| OLD | NEW |
| 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)/browser_tests<(EXECUTABLE_SUFFIX)', | 10 '<(PRODUCT_DIR)/browser_tests<(EXECUTABLE_SUFFIX)', |
| (...skipping 167 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 178 ], | 178 ], |
| 179 }, | 179 }, |
| 180 }], | 180 }], |
| 181 ['OS=="mac"', { | 181 ['OS=="mac"', { |
| 182 'variables': { | 182 'variables': { |
| 183 'files': [ | 183 'files': [ |
| 184 '<(PRODUCT_DIR)/clearkeycdmadapter.plugin', | 184 '<(PRODUCT_DIR)/clearkeycdmadapter.plugin', |
| 185 '<(PRODUCT_DIR)/content_shell.pak', | 185 '<(PRODUCT_DIR)/content_shell.pak', |
| 186 '<(PRODUCT_DIR)/libclearkeycdm.dylib', | 186 '<(PRODUCT_DIR)/libclearkeycdm.dylib', |
| 187 '<(PRODUCT_DIR)/osmesa.so', | 187 '<(PRODUCT_DIR)/osmesa.so', |
| 188 '<(PRODUCT_DIR)/plugins/test_netscape_plugin.plugin/', | |
| 189 '<(PRODUCT_DIR)/power_saver_test_plugin.plugin/Contents/MacOS/power_sa
ver_test_plugin', | 188 '<(PRODUCT_DIR)/power_saver_test_plugin.plugin/Contents/MacOS/power_sa
ver_test_plugin', |
| 190 '<(PRODUCT_DIR)/ppapi_tests.plugin/Contents/MacOS/ppapi_tests', | 189 '<(PRODUCT_DIR)/ppapi_tests.plugin/Contents/MacOS/ppapi_tests', |
| 191 ], | 190 ], |
| 192 }, | 191 }, |
| 193 }], | 192 }], |
| 194 ['OS=="mac" and branding=="Chrome" and enable_pepper_cdms==1', { | 193 ['OS=="mac" and branding=="Chrome" and enable_pepper_cdms==1', { |
| 195 'variables': { | 194 'variables': { |
| 196 'files': [ | 195 'files': [ |
| 197 '<(PRODUCT_DIR)/libwidevinecdm.dylib', | 196 '<(PRODUCT_DIR)/libwidevinecdm.dylib', |
| 198 '<(PRODUCT_DIR)/widevinecdmadapter.plugin', | 197 '<(PRODUCT_DIR)/widevinecdmadapter.plugin', |
| 199 ], | 198 ], |
| 200 }, | 199 }, |
| 201 }], | 200 }], |
| 202 ['OS=="win"', { | 201 ['OS=="win"', { |
| 203 'variables': { | 202 'variables': { |
| 204 'files': [ | 203 'files': [ |
| 205 '../native_client/build/build_nexe.py', | 204 '../native_client/build/build_nexe.py', |
| 206 '<(PRODUCT_DIR)/chrome_elf.dll', | 205 '<(PRODUCT_DIR)/chrome_elf.dll', |
| 207 '<(PRODUCT_DIR)/clearkeycdm.dll', | 206 '<(PRODUCT_DIR)/clearkeycdm.dll', |
| 208 '<(PRODUCT_DIR)/clearkeycdmadapter.dll', | 207 '<(PRODUCT_DIR)/clearkeycdmadapter.dll', |
| 209 '<(PRODUCT_DIR)/crashpad_handler.exe', | 208 '<(PRODUCT_DIR)/crashpad_handler.exe', |
| 210 '<(PRODUCT_DIR)/plugins/', | |
| 211 '<(PRODUCT_DIR)/power_saver_test_plugin.dll', | 209 '<(PRODUCT_DIR)/power_saver_test_plugin.dll', |
| 212 '<(PRODUCT_DIR)/ppapi_tests.dll', | 210 '<(PRODUCT_DIR)/ppapi_tests.dll', |
| 213 'tools/build/repack_locales.py', | 211 'tools/build/repack_locales.py', |
| 214 ], | 212 ], |
| 215 }, | 213 }, |
| 216 }], | 214 }], |
| 217 ['OS=="win" and branding=="Chrome" and enable_pepper_cdms==1', { | 215 ['OS=="win" and branding=="Chrome" and enable_pepper_cdms==1', { |
| 218 'variables': { | 216 'variables': { |
| 219 'files': [ | 217 'files': [ |
| 220 '<(PRODUCT_DIR)/widevinecdm.dll', | 218 '<(PRODUCT_DIR)/widevinecdm.dll', |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 266 'browser/chromeos/login/test/https_forwarder.py', | 264 'browser/chromeos/login/test/https_forwarder.py', |
| 267 ], | 265 ], |
| 268 }, | 266 }, |
| 269 }], | 267 }], |
| 270 ], | 268 ], |
| 271 'includes': [ | 269 'includes': [ |
| 272 '../base/base.isolate', | 270 '../base/base.isolate', |
| 273 'chrome.isolate', | 271 'chrome.isolate', |
| 274 ], | 272 ], |
| 275 } | 273 } |
| OLD | NEW |