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

Unified Diff: chrome/chrome_dll.gypi

Issue 1825603003: Reland of move configuration policy from chrome build files. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@policy_chrome_defines
Patch Set: Created 4 years, 9 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_common.gypi ('k') | 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 9ee23c53f24c4a1e83a7222b0e9998d533b09ee7..a84463bb84e180425186d915c970de27efc702e6 100644
--- a/chrome/chrome_dll.gypi
+++ b/chrome/chrome_dll.gypi
@@ -122,16 +122,13 @@
'dependencies': [
'<@(chromium_browser_dependencies)',
'chrome_features.gyp:chrome_common_features',
+ 'policy_path_parser',
'../content/content.gyp:content_app_browser',
],
'conditions': [
['OS=="win"', {
'dependencies': [
'<(DEPTH)/chrome_elf/chrome_elf.gyp:chrome_elf',
- ],
- }],
- ['OS=="win" and configuration_policy==1', {
- 'dependencies': [
'<(DEPTH)/components/components.gyp:policy',
],
}],
@@ -363,6 +360,9 @@
],
'conditions': [
['OS=="win"', {
+ 'dependencies': [
+ '<(DEPTH)/components/components.gyp:policy',
+ ],
'conditions': [
['chrome_pgo_phase!=0', {
# Disable Warning 4702 ("Unreachable code") for the WPO/PGO
@@ -399,16 +399,6 @@
}],
]
}],
- ['OS=="win" and configuration_policy==1', {
- 'dependencies': [
- '<(DEPTH)/components/components.gyp:policy',
- ],
- }],
- ['configuration_policy==1', {
- 'dependencies': [
- 'policy_path_parser',
- ],
- }],
['enable_plugins==1', {
'dependencies': [
'../pdf/pdf.gyp:pdf',
« no previous file with comments | « chrome/chrome_common.gypi ('k') | chrome/chrome_exe.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698