diff options
| author | jiangj@opera.com <jiangj@opera.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-14 15:36:57 +0000 |
|---|---|---|
| committer | jiangj@opera.com <jiangj@opera.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-14 15:36:57 +0000 |
| commit | 78c5172b1ba95b9435d8be44af3adc16cc5c0ed5 (patch) | |
| tree | 485c4c9c15c19f32b6f906db8412b9f10a754780 /chrome/chrome_exe.gypi | |
| parent | b61b05ce8dafabe9b60cd9165d85255f39c3a193 (diff) | |
| download | chromium_src-78c5172b1ba95b9435d8be44af3adc16cc5c0ed5.zip chromium_src-78c5172b1ba95b9435d8be44af3adc16cc5c0ed5.tar.gz chromium_src-78c5172b1ba95b9435d8be44af3adc16cc5c0ed5.tar.bz2 | |
Fix policy_component shared_library link without configuration_policy
It should depend on url_matcher as url_blacklist_manager uses it.
Review URL: https://codereview.chromium.org/284493002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@270410 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_exe.gypi')
| -rw-r--r-- | chrome/chrome_exe.gypi | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/chrome/chrome_exe.gypi b/chrome/chrome_exe.gypi index b7a23b1..c0fe832 100644 --- a/chrome/chrome_exe.gypi +++ b/chrome/chrome_exe.gypi @@ -501,7 +501,6 @@ '../breakpad/breakpad.gyp:breakpad_sender', '../chrome_elf/chrome_elf.gyp:chrome_elf', '../components/components.gyp:breakpad_component', - '../components/components.gyp:policy', '../sandbox/sandbox.gyp:sandbox', ], 'sources': [ @@ -534,6 +533,13 @@ ], }, }, + 'conditions': [ + ['configuration_policy==1', { + 'dependencies': [ + '<(DEPTH)/components/components.gyp:policy', + ], + }], + ], 'actions': [ { 'action_name': 'first_run', @@ -628,7 +634,6 @@ '../breakpad/breakpad.gyp:breakpad_sender_win64', '../components/components.gyp:breakpad_win64', '../chrome/common_constants.gyp:common_constants_win64', - '../components/components.gyp:policy_win64', '../components/nacl.gyp:nacl_win64', '../crypto/crypto.gyp:crypto_nacl_win64', '../ipc/ipc.gyp:ipc_win64', @@ -652,6 +657,13 @@ 'msvs_target_platform': 'x64', }, }, + 'conditions': [ + ['configuration_policy==1', { + 'dependencies': [ + '<(DEPTH)/components/components.gyp:policy_win64', + ], + }], + ], }, ], }, { # else (disable_nacl==1) |