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

Unified Diff: chrome/chrome_exe.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_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 58f70d3a11ee7cd085894fc6de892e77a5f0a715..0c878b2e5500a0bd596f876beba7ffba6499885f 100644
--- a/chrome/chrome_exe.gypi
+++ b/chrome/chrome_exe.gypi
@@ -418,6 +418,7 @@
'../components/components.gyp:crash_component',
'../components/components.gyp:crash_core_common',
'../components/components.gyp:flags_ui_switches',
+ '../components/components.gyp:policy',
'../components/components.gyp:startup_metric_utils_common',
'../sandbox/sandbox.gyp:sandbox',
'../third_party/kasko/kasko.gyp:kasko_features',
@@ -459,13 +460,6 @@
],
},
},
- 'conditions': [
- ['configuration_policy==1', {
- 'dependencies': [
- '<(DEPTH)/components/components.gyp:policy',
- ],
- }],
- ],
'actions': [
{
'action_name': 'first_run',
@@ -546,6 +540,7 @@
'../components/components.gyp:breakpad_win64',
'../components/components.gyp:crash_core_common_win64',
'../components/components.gyp:flags_ui_switches_win64',
+ '../components/components.gyp:policy_win64',
'../chrome/common_constants.gyp:common_constants_win64',
'../components/nacl.gyp:nacl_win64',
'../crypto/crypto.gyp:crypto_nacl_win64',
@@ -571,13 +566,6 @@
'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