From 25955612a93ebfcc60585267e5dd6ec470380db5 Mon Sep 17 00:00:00 2001 From: brettw Date: Tue, 22 Mar 2016 10:23:23 -0700 Subject: 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} --- components/syncable_prefs.gypi | 3 +++ 1 file changed, 3 insertions(+) (limited to 'components/syncable_prefs.gypi') 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', ], -- cgit v1.1