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

Unified Diff: chrome/chrome_dll.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 | « no previous file | chrome/chrome_exe.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome_dll.gypi
diff --git a/chrome/chrome_dll.gypi b/chrome/chrome_dll.gypi
index fc2cc1cbe06778a18bee950926bb86e928a102dd..8891d27d930d6d1ee8b6d75cacc2923b030779e9 100644
--- a/chrome/chrome_dll.gypi
+++ b/chrome/chrome_dll.gypi
@@ -78,7 +78,6 @@
},
'dependencies': [
'<@(chromium_browser_dependencies)',
- '../components/components.gyp:policy',
'../content/content.gyp:content_app_browser',
],
'conditions': [
@@ -87,6 +86,11 @@
'<(DEPTH)/chrome_elf/chrome_elf.gyp:chrome_elf',
],
}],
+ ['OS=="win" and configuration_policy==1', {
+ 'dependencies': [
+ '<(DEPTH)/components/components.gyp:policy',
+ ],
+ }],
['use_aura==1', {
'dependencies': [
'../ui/compositor/compositor.gyp:compositor',
« no previous file with comments | « no previous file | chrome/chrome_exe.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698