forked from chromium/chromium
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add support for component=shared_library for base_unittests_run.
Specifically, this adds support to run base_unittests isolated via 'isolate.py run' when built with component build. This requires rolling icu @ 246118 to get the new icu.isolate. R=thakis@chromium.org,jshin@chromium.org,frankf@chromium.org,rsleevi@chromium.org BUG=336439 Review URL: https://codereview.chromium.org/132233030 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@246247 0039d316-1c4b-4281-b951-d872f2087c98
- Loading branch information
maruel@chromium.org
committed
Jan 22, 2014
1 parent
d2b8e0a
commit c9ea791
Showing
7 changed files
with
86 additions
and
10 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,38 @@ | ||
# 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. | ||
{ | ||
'conditions': [ | ||
['OS=="linux" and component=="shared_library"', { | ||
'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', | ||
], | ||
}, | ||
}], | ||
['OS=="win" and component=="shared_library"', { | ||
'variables': { | ||
'isolate_dependency_tracked': [ | ||
'<(PRODUCT_DIR)/base.dll', | ||
'<(PRODUCT_DIR)/base_i18n.dll', | ||
'<(PRODUCT_DIR)/base_prefs.dll', | ||
], | ||
}, | ||
}], | ||
], | ||
'includes': [ | ||
'../build/linux/system.isolate', | ||
'../third_party/icu/icu.isolate', | ||
], | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -56,6 +56,6 @@ | |
}], | ||
], | ||
'includes': [ | ||
'../third_party/icu/icu.isolate', | ||
'base.isolate', | ||
], | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
# 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. | ||
{ | ||
'includes': [ | ||
'../../net/third_party/nss/ssl.isolate', | ||
], | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
# 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. | ||
{ | ||
'conditions': [ | ||
['OS=="linux" and component=="shared_library" and use_openssl==0', { | ||
'variables': { | ||
'isolate_dependency_tracked': [ | ||
'<(PRODUCT_DIR)/lib/libcrssl.so', | ||
], | ||
}, | ||
}], | ||
], | ||
} |