Merge from Chromium at DEPS revision 262940
This commit was generated by merge_to_master.py.
Change-Id: I9a3fddbb29857fa8f68a18c6a0115862b65f84d1
diff --git a/net/net_unittests.isolate b/net/net_unittests.isolate
index 50ea631..662eeb0 100644
--- a/net/net_unittests.isolate
+++ b/net/net_unittests.isolate
@@ -32,22 +32,14 @@
'../third_party/pyftpdlib/',
'../third_party/pywebsocket/',
'../third_party/tlslite/',
- '../tools/swarming_client/',
'<(PRODUCT_DIR)/pyproto/',
'tools/testserver/',
],
'read_only': 1,
},
}],
- ['OS=="linux" and component=="shared_library"', {
- 'variables': {
- 'isolate_dependency_tracked': [
- '<(PRODUCT_DIR)/lib/libopenssl.so',
- ],
- },
- }],
],
'includes': [
- 'net.isolate',
+ '../base/base.isolate',
],
}