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

Unified Diff: chrome/chrome_exe.gypi

Issue 284493002: Fix policy_component shared_library link without configuration_policy (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Put policy_pref_names.cc in two separate sources list Created 6 years, 7 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
« no previous file with comments | « chrome/chrome_dll.gypi ('k') | chrome/chrome_process_finder.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome_exe.gypi
diff --git a/chrome/chrome_exe.gypi b/chrome/chrome_exe.gypi
index b7a23b1ecabf453497363eb75661901da6b975a4..c0fe8326b95fc0ba9d785c3a45bbc153be150a4a 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)
« no previous file with comments | « chrome/chrome_dll.gypi ('k') | chrome/chrome_process_finder.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698