diff options
| author | kjellander@chromium.org <kjellander@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-10 21:14:46 +0000 |
|---|---|---|
| committer | kjellander@chromium.org <kjellander@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-10 21:14:46 +0000 |
| commit | d69acbc7e1b9c0e10fffaafd463f10eac7c4c087 (patch) | |
| tree | ee29e5d4bb905b5eba49c71465e9790f212c8215 | |
| parent | ac962032d7446017841462a2e612bbed1fe1af36 (diff) | |
| download | chromium_src-d69acbc7e1b9c0e10fffaafd463f10eac7c4c087.zip chromium_src-d69acbc7e1b9c0e10fffaafd463f10eac7c4c087.tar.gz chromium_src-d69acbc7e1b9c0e10fffaafd463f10eac7c4c087.tar.bz2 | |
Add libpeerconnection.{so,dll} to browser_tests.isolate
BUG=none
Review URL: https://codereview.chromium.org/153093002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@250207 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | build/common.gypi | 3 | ||||
| -rw-r--r-- | build/isolate.gypi | 1 | ||||
| -rw-r--r-- | chrome/browser_tests.isolate | 14 |
3 files changed, 18 insertions, 0 deletions
diff --git a/build/common.gypi b/build/common.gypi index 43f73de..4b254f9 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -1147,6 +1147,9 @@ # TODO(thakis): Make this a blacklist instead, http://crbug.com/101600 'enable_wexit_time_destructors%': 0, + # Build libpeerconnection as a static library by default. + 'libpeer_target_type%': 'static_library', + # Set to 1 to compile with the built in pdf viewer. 'internal_pdf%': 0, diff --git a/build/isolate.gypi b/build/isolate.gypi index 7a46458..c9a15ad 100644 --- a/build/isolate.gypi +++ b/build/isolate.gypi @@ -95,6 +95,7 @@ '--config-variable', 'internal_gles2_conform_tests=<(internal_gles2_conform_tests)', '--config-variable', 'icu_use_data_file_flag=<(icu_use_data_file_flag)', + '--config-variable', 'libpeer_target_type=<(libpeer_target_type)', '--config-variable', 'use_openssl=<(use_openssl)', ], 'conditions': [ diff --git a/chrome/browser_tests.isolate b/chrome/browser_tests.isolate index 6b377a4..668b4b9 100644 --- a/chrome/browser_tests.isolate +++ b/chrome/browser_tests.isolate @@ -23,6 +23,13 @@ ], }, }], + ['OS=="linux" and libpeer_target_type=="loadable_module"', { + 'variables': { + 'isolate_dependency_tracked': [ + '<(PRODUCT_DIR)/lib/libpeerconnection.so', + ], + }, + }], ['OS=="linux" or OS=="mac"', { 'variables': { 'isolate_dependency_tracked': [ @@ -136,6 +143,13 @@ ], }, }], + ['OS=="win" and libpeer_target_type=="loadable_module"', { + 'variables': { + 'isolate_dependency_tracked': [ + '<(PRODUCT_DIR)/libpeerconnection.dll', + ], + }, + }], ['chromeos==1', { 'variables': { 'isolate_dependency_untracked': [ |