Merge from Chromium at DEPS revision 251904
This commit was generated by merge_to_master.py.
Change-Id: I1f9543259d7d2a57d81aa41a1b84f85837439d21
diff --git a/net/net_unittests.isolate b/net/net_unittests.isolate
index 2e04ea3..50ea631 100644
--- a/net/net_unittests.isolate
+++ b/net/net_unittests.isolate
@@ -1,4 +1,4 @@
-# Copyright (c) 2012 The Chromium Authors. All rights reserved.
+# Copyright 2014 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
{
@@ -36,14 +36,18 @@
'<(PRODUCT_DIR)/pyproto/',
'tools/testserver/',
],
+ 'read_only': 1,
},
}],
- ['OS=="win"', {
+ ['OS=="linux" and component=="shared_library"', {
'variables': {
'isolate_dependency_tracked': [
- '<(PRODUCT_DIR)/icudt.dll',
+ '<(PRODUCT_DIR)/lib/libopenssl.so',
],
},
}],
],
+ 'includes': [
+ 'net.isolate',
+ ],
}