diff options
author | maruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-05 23:33:48 +0000 |
---|---|---|
committer | maruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-05 23:33:48 +0000 |
commit | bddb76d80b4cacd5f9af0c0cbbafc843f7b676ed (patch) | |
tree | 8598a00711ebb82b64435d98aabe602481a2f171 /net/third_party/nss | |
parent | 4feddf72f2569f393cddbf82f01507cfb16a152d (diff) | |
download | chromium_src-bddb76d80b4cacd5f9af0c0cbbafc843f7b676ed.zip chromium_src-bddb76d80b4cacd5f9af0c0cbbafc843f7b676ed.tar.gz chromium_src-bddb76d80b4cacd5f9af0c0cbbafc843f7b676ed.tar.bz2 |
Make net_unittests_run work with component=shared_library.
Specifically, this adds support to run net_unittests isolated via 'isolate.py
run' when built with component build.
R=vadimsh@chromium.org,brettw@chromium.org,rsleevi@chromium.org
BUG=336439
Review URL: https://codereview.chromium.org/134003004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@249150 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/third_party/nss')
-rw-r--r-- | net/third_party/nss/ssl.isolate | 14 | ||||
-rw-r--r-- | net/third_party/nss/ssl_base.isolate | 16 |
2 files changed, 28 insertions, 2 deletions
diff --git a/net/third_party/nss/ssl.isolate b/net/third_party/nss/ssl.isolate index db208ed..f538e82 100644 --- a/net/third_party/nss/ssl.isolate +++ b/net/third_party/nss/ssl.isolate @@ -3,12 +3,22 @@ # found in the LICENSE file. { 'conditions': [ - ['OS=="linux" and component=="shared_library" and use_openssl==0', { + ['OS=="mac" and component=="shared_library"', { 'variables': { 'isolate_dependency_tracked': [ - '<(PRODUCT_DIR)/lib/libcrssl.so', + '<(PRODUCT_DIR)/libcrssl.dylib', ], }, }], + ['OS=="win" and component=="shared_library"', { + 'variables': { + 'isolate_dependency_tracked': [ + '<(PRODUCT_DIR)/crssl.dll', + ], + }, + }], + ], + 'includes': [ + 'ssl_base.isolate', ], } diff --git a/net/third_party/nss/ssl_base.isolate b/net/third_party/nss/ssl_base.isolate new file mode 100644 index 0000000..3bae2bd --- /dev/null +++ b/net/third_party/nss/ssl_base.isolate @@ -0,0 +1,16 @@ +# 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. +# +# This is what is included by base_unittests. +{ + 'conditions': [ + ['OS=="linux" and component=="shared_library" and use_openssl==0', { + 'variables': { + 'isolate_dependency_tracked': [ + '<(PRODUCT_DIR)/lib/libcrssl.so', + ], + }, + }], + ], +} |