diff options
| author | Ben Murdoch <benm@google.com> | 2014-04-10 11:22:14 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2014-04-10 11:22:14 +0100 |
| commit | c5cede9ae108bb15f6b7a8aea21c7e1fefa2834c (patch) | |
| tree | e9edd581ad60ab80aa5ab423a2a80df652a75792 /chrome/browser_tests.isolate | |
| parent | 54cd42278ccf1d52996034848086a09b23065a40 (diff) | |
| download | chromium_org-c5cede9ae108bb15f6b7a8aea21c7e1fefa2834c.tar.gz | |
Merge from Chromium at DEPS revision 262940
This commit was generated by merge_to_master.py.
Change-Id: I9a3fddbb29857fa8f68a18c6a0115862b65f84d1
Diffstat (limited to 'chrome/browser_tests.isolate')
| -rw-r--r-- | chrome/browser_tests.isolate | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser_tests.isolate b/chrome/browser_tests.isolate index 146c9f6fed..237d48e62d 100644 --- a/chrome/browser_tests.isolate +++ b/chrome/browser_tests.isolate @@ -75,7 +75,6 @@ '../third_party/safe_browsing/', '../third_party/simplejson/', '../third_party/tlslite/', - '../tools/swarming_client/', '<(PRODUCT_DIR)/nacl_test_data/', '<(PRODUCT_DIR)/pnacl/', '<(PRODUCT_DIR)/pseudo_locales/', @@ -110,6 +109,7 @@ 'isolate_dependency_tracked': [ '<(PRODUCT_DIR)/clearkeycdmadapter.plugin', '<(PRODUCT_DIR)/libclearkeycdm.dylib', + '<(PRODUCT_DIR)/osmesa.so', '<(PRODUCT_DIR)/ppapi_nacl_tests_glibc_x32.nexe', '<(PRODUCT_DIR)/ppapi_nacl_tests_newlib_x32.nexe', '<(PRODUCT_DIR)/ppapi_nacl_tests_pnacl_newlib_x32.nexe', |