diff options
| author | dgozman <dgozman@chromium.org> | 2016-03-22 14:17:26 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-03-22 21:18:27 +0000 |
| commit | e742862f9555579e3239d9658766081ac4729e92 (patch) | |
| tree | b4aff54529202b0b8f2a7608c5936c6a52328861 /chrome/chrome_browser_extensions.gypi | |
| parent | 18a861d65e82a16f8cfbc7d3f160cfb3746523e2 (diff) | |
| download | chromium_src-e742862f9555579e3239d9658766081ac4729e92.zip chromium_src-e742862f9555579e3239d9658766081ac4729e92.tar.gz chromium_src-e742862f9555579e3239d9658766081ac4729e92.tar.bz2 | |
Revert of Remove configuration policy from chrome build files. (patchset #4 id:60001 of https://codereview.chromium.org/1798273002/ )
Reason for revert:
Speculative revert: could have caused the Win8 GN build failures. See crbug.com/597032
Original issue's description:
> Remove configuration policy from chrome build files.
>
> The define was removed from src/chrome source files in https://codereview.chromium.org/1786263002/, this patch only touches the build files in src/chrome. Build updates outside of this directory will be updated in subsequent passes.
>
> BUG=594261
>
> Committed: https://crrev.com/db234c06ff6c308520594591fa54f80b08411888
> Cr-Commit-Position: refs/heads/master@{#382614}
TBR=atwilson@chromium.org,brettw@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=594261
Review URL: https://codereview.chromium.org/1818423003
Cr-Commit-Position: refs/heads/master@{#382681}
Diffstat (limited to 'chrome/chrome_browser_extensions.gypi')
| -rw-r--r-- | chrome/chrome_browser_extensions.gypi | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/chrome/chrome_browser_extensions.gypi b/chrome/chrome_browser_extensions.gypi index d222f40..33c7dac 100644 --- a/chrome/chrome_browser_extensions.gypi +++ b/chrome/chrome_browser_extensions.gypi @@ -467,10 +467,6 @@ 'browser/extensions/api/signed_in_devices/signed_in_devices_manager.h', 'browser/extensions/api/spellcheck/spellcheck_api.cc', 'browser/extensions/api/spellcheck/spellcheck_api.h', - 'browser/extensions/api/storage/managed_value_store_cache.cc', - 'browser/extensions/api/storage/managed_value_store_cache.h', - 'browser/extensions/api/storage/policy_value_store.cc', - 'browser/extensions/api/storage/policy_value_store.h', 'browser/extensions/api/storage/setting_sync_data.cc', 'browser/extensions/api/storage/setting_sync_data.h', 'browser/extensions/api/storage/settings_sync_processor.cc', @@ -802,8 +798,6 @@ 'browser/extensions/permissions_updater.h', 'browser/extensions/plugin_manager.cc', 'browser/extensions/plugin_manager.h', - 'browser/extensions/policy_handlers.cc', - 'browser/extensions/policy_handlers.h', 'browser/extensions/proxy_overridden_bubble_delegate.cc', 'browser/extensions/proxy_overridden_bubble_delegate.h', 'browser/extensions/scripting_permissions_modifier.cc', @@ -924,6 +918,12 @@ 'browser/extensions/api/braille_display_private/brlapi_keycode_map.cc', 'browser/extensions/api/braille_display_private/brlapi_keycode_map.h', ], + 'chrome_browser_extensions_policy_sources': [ + 'browser/extensions/api/storage/managed_value_store_cache.cc', + 'browser/extensions/api/storage/managed_value_store_cache.h', + 'browser/extensions/api/storage/policy_value_store.cc', + 'browser/extensions/api/storage/policy_value_store.h', + ], 'chrome_browser_extensions_input_ime_linux_win_sources': [ 'browser/extensions/api/input_ime/input_ime_api.cc', 'browser/extensions/api/input_ime/input_ime_api.h', @@ -966,7 +966,6 @@ '../components/components.gyp:copresence', '../components/components.gyp:dom_distiller_core', '../components/components.gyp:onc_component', - '../components/components.gyp:policy', '../components/components.gyp:proximity_auth', '../components/components.gyp:update_client', '../components/components.gyp:url_matcher', @@ -1087,6 +1086,16 @@ }], ], }], + ['configuration_policy==1', { + 'dependencies': [ + '../components/components.gyp:policy', + ], + 'sources': [ + 'browser/extensions/policy_handlers.cc', + 'browser/extensions/policy_handlers.h', + '<@(chrome_browser_extensions_policy_sources)', + ], + }], ['OS=="win" or OS=="mac"', { 'dependencies': [ '../components/components.gyp:wifi_component', |