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_common.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_common.gypi')
| -rw-r--r-- | chrome/chrome_common.gypi | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi index b4733df..1f71565 100644 --- a/chrome/chrome_common.gypi +++ b/chrome/chrome_common.gypi @@ -332,7 +332,6 @@ '<(DEPTH)/components/components.gyp:metrics', '<(DEPTH)/components/components.gyp:metrics_net', '<(DEPTH)/components/components.gyp:omnibox_common', - '<(DEPTH)/components/components.gyp:policy', '<(DEPTH)/components/components.gyp:policy_component_common', # TODO(fdoray): Remove this once the PreRead field trial has expired. # crbug.com/577698 @@ -517,6 +516,11 @@ 'common/media/webrtc_logging_messages.h', ] }], + ['configuration_policy==1', { + 'dependencies': [ + '<(DEPTH)/components/components.gyp:policy', + ], + }], ['safe_browsing==1', { 'sources': [ '<@(chrome_common_full_safe_browsing_sources)', ], }], |