diff options
| author | brettw <brettw@chromium.org> | 2016-03-22 10:23:23 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-03-22 17:24:57 +0000 |
| commit | 25955612a93ebfcc60585267e5dd6ec470380db5 (patch) | |
| tree | d5c58c7a744905e09d8ab940ee5f44b7f897eb75 /components/syncable_prefs.gypi | |
| parent | 4192192a724363263fd878f99c7ca38cc42550f7 (diff) | |
| download | chromium_src-25955612a93ebfcc60585267e5dd6ec470380db5.zip chromium_src-25955612a93ebfcc60585267e5dd6ec470380db5.tar.gz chromium_src-25955612a93ebfcc60585267e5dd6ec470380db5.tar.bz2 | |
Remove configuration policy define
Removes the ability to override the definition of configuration_policy from outside the build, since this no longer works. It is now hardcoded to be on everywhere except iOS.
Renames the define used by syncable_prefs to make more clear this is a local flag only. This is the only code that still needs to use preprocessor based on the presence of policy. I removed the ifdef from the header and always declared the functions to prevent define skew, and just assert if the functions are called inappropriately.
Review URL: https://codereview.chromium.org/1805213002
Cr-Commit-Position: refs/heads/master@{#382595}
Diffstat (limited to 'components/syncable_prefs.gypi')
| -rw-r--r-- | components/syncable_prefs.gypi | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/components/syncable_prefs.gypi b/components/syncable_prefs.gypi index e4cfc43..66943f4 100644 --- a/components/syncable_prefs.gypi +++ b/components/syncable_prefs.gypi @@ -32,7 +32,10 @@ ], 'conditions': [ ['configuration_policy==1', { + # This define is only used for compiling the .cc files in this target. + 'defines': [ "SYNCABLE_PREFS_USE_POLICY" ], 'dependencies': [ + 'cloud_policy_code_generate', 'policy_component_browser', 'policy_component_common', ], |