Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1405)

Unified Diff: net/third_party/nss/ssl_net.isolate

Issue 134003004: Make net_unittests_run work with component=shared_library. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: net/third_party/nss/ssl_net.isolate
diff --git a/base/base.isolate b/net/third_party/nss/ssl_net.isolate
similarity index 50%
copy from base/base.isolate
copy to net/third_party/nss/ssl_net.isolate
index c92a14b650ba67a0a38b0fdf0fdb955e96586c81..36848eb8cf7ec139374942d9956333d39b174649 100644
--- a/base/base.isolate
+++ b/net/third_party/nss/ssl_net.isolate
@@ -2,37 +2,29 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
{
+ # These are the targets built when building net.
'conditions': [
- ['OS=="linux" and component=="shared_library"', {
+ ['OS=="linux" and component=="shared_library" and use_openssl==0', {
'variables': {
'isolate_dependency_tracked': [
- '<(PRODUCT_DIR)/lib/libbase.so',
- '<(PRODUCT_DIR)/lib/libbase_i18n.so',
- '<(PRODUCT_DIR)/lib/libbase_prefs.so',
],
},
}],
['OS=="mac" and component=="shared_library"', {
'variables': {
'isolate_dependency_tracked': [
- '<(PRODUCT_DIR)/libbase.dylib',
- '<(PRODUCT_DIR)/libbase_i18n.dylib',
- '<(PRODUCT_DIR)/libbase_prefs.dylib',
+ '<(PRODUCT_DIR)/libcrssl.dylib',
+ '<(PRODUCT_DIR)/libcrnss.dylib',
],
},
}],
['OS=="win" and component=="shared_library"', {
'variables': {
'isolate_dependency_tracked': [
- '<(PRODUCT_DIR)/base.dll',
- '<(PRODUCT_DIR)/base_i18n.dll',
- '<(PRODUCT_DIR)/base_prefs.dll',
+ '<(PRODUCT_DIR)/crssl.dll',
+ '<(PRODUCT_DIR)/crnss.dll',
],
},
}],
],
- 'includes': [
- '../build/linux/system.isolate',
- '../third_party/icu/icu.isolate',
- ],
}

Powered by Google App Engine
This is Rietveld 408576698