diff options
author | Ben Murdoch <benm@google.com> | 2014-07-20 18:25:52 -0700 |
---|---|---|
committer | Ben Murdoch <benm@google.com> | 2014-07-20 18:25:52 -0700 |
commit | 116680a4aac90f2aa7413d9095a592090648e557 (patch) | |
tree | f7c6fed0e63d6a2804243d4a31a752dca39fb076 /chrome/browser_tests.isolate | |
parent | 1f14a4515e04c9ffc9bac4dd1e2f68611626b800 (diff) | |
download | chromium_org-116680a4aac90f2aa7413d9095a592090648e557.tar.gz |
Merge from Chromium at DEPS revision 284076
This commit was generated by merge_to_master.py.
Change-Id: I9a279485b02fe7ceddcd32d992a714ff132e99ae
Diffstat (limited to 'chrome/browser_tests.isolate')
-rw-r--r-- | chrome/browser_tests.isolate | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/chrome/browser_tests.isolate b/chrome/browser_tests.isolate index 61b46f6564..111036be5d 100644 --- a/chrome/browser_tests.isolate +++ b/chrome/browser_tests.isolate @@ -67,6 +67,7 @@ ], 'isolate_dependency_untracked': [ '../content/test/data/', + '../media/test/data/', '../net/data/', '../net/tools/testserver/', '../third_party/WebKit/Tools/Scripts/', @@ -79,6 +80,7 @@ '<(PRODUCT_DIR)/pnacl/', '<(PRODUCT_DIR)/pseudo_locales/', '<(PRODUCT_DIR)/pyproto/', + '<(PRODUCT_DIR)/remoting/unittests/', '<(PRODUCT_DIR)/test_data/chrome/', '<(PRODUCT_DIR)/test_data/ppapi/', '<(PRODUCT_DIR)/test_url_loader_data/', |