diff options
| author | paulmeyer <paulmeyer@chromium.org> | 2015-06-17 14:26:12 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-06-17 21:27:42 +0000 |
| commit | 27b328bf38b552b1576c0a0368c00a36be5ec781 (patch) | |
| tree | c7fc33b1f8606a4305be2c5e29ffeef94501e756 /components/components_tests.gyp | |
| parent | 1fa4219648d62b18de8729b53abefa2ab0c6dd94 (diff) | |
| download | chromium_src-27b328bf38b552b1576c0a0368c00a36be5ec781.zip chromium_src-27b328bf38b552b1576c0a0368c00a36be5ec781.tar.gz chromium_src-27b328bf38b552b1576c0a0368c00a36be5ec781.tar.bz2 | |
Revert of Revert of views: Move TOOLKIT_VIEWS definition in //ui/views/ from root. (patchset #1 id:1 of https://codereview.chromium.org/1192583002/)
Reason for revert:
Unreverting because this CL did not end up being the problem.
Original issue's description:
> Revert of views: Move TOOLKIT_VIEWS definition in //ui/views/ from root. (patchset #6 id:100001 of https://codereview.chromium.org/1175603002/)
>
> Reason for revert:
> Speculative revert to fix win unit_test failures. https://build.chromium.org/p/chromium.win/builders/Win7%20Tests%20%281%29/builds/39651
>
> Original issue's description:
> > views: Move TOOLKIT_VIEWS definition in //ui/views/ from root.
> >
> > If 'toolkit_views' gyp/gn flag is toggled, then it shouldn't cause targets that
> > do not depend on views to be rebuilt. To make this happen, remove the definition
> > of the TOOLKIT_VIEWS flag from the top-level config into a config in views, so
> > that only targets that explicitly depend on views get the define, and are
> > affected by the switch.
> >
> > BUG=500004
> > R=ben@chromium.org, sky@chromium.org
> >
> > Committed: https://chromium.googlesource.com/chromium/src/+/c13fc9ff0aedca62ebfdfc27d44c6b5ac204c9d8
>
> TBR=ben@chromium.org,sky@chromium.org,sadrul@chromium.org
> NOPRESUBMIT=true
> NOTREECHECKS=true
> NOTRY=true
> BUG=500004
>
> Committed: https://crrev.com/ecbf7e40116d555c11ee958b6339618920d11c2c
> Cr-Commit-Position: refs/heads/master@{#334820}
TBR=ben@chromium.org,sky@chromium.org,sadrul@chromium.org,phoglund@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=500004
Review URL: https://codereview.chromium.org/1182053007
Cr-Commit-Position: refs/heads/master@{#334923}
Diffstat (limited to 'components/components_tests.gyp')
| -rw-r--r-- | components/components_tests.gyp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/components/components_tests.gyp b/components/components_tests.gyp index 251f568..1b037f4 100644 --- a/components/components_tests.gyp +++ b/components/components_tests.gyp @@ -851,6 +851,7 @@ 'constrained_window/constrained_window_views_unittest.cc', ], 'dependencies': [ + '<(DEPTH)/ui/views/views.gyp:views', '<(DEPTH)/ui/views/views.gyp:views_test_support', 'components.gyp:constrained_window', ] |