summaryrefslogtreecommitdiffstats
path: root/components/components_tests.gyp
diff options
context:
space:
mode:
authorphoglund <phoglund@chromium.org>2015-06-17 06:44:05 -0700
committerCommit bot <commit-bot@chromium.org>2015-06-17 13:44:32 +0000
commitecbf7e40116d555c11ee958b6339618920d11c2c (patch)
tree2962e11ef9e39f3ddcb5f9801e852360bfc66d6e /components/components_tests.gyp
parentd78c08660c7dd25ed45c024b314a9a893af7d96d (diff)
downloadchromium_src-ecbf7e40116d555c11ee958b6339618920d11c2c.zip
chromium_src-ecbf7e40116d555c11ee958b6339618920d11c2c.tar.gz
chromium_src-ecbf7e40116d555c11ee958b6339618920d11c2c.tar.bz2
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 Review URL: https://codereview.chromium.org/1192583002 Cr-Commit-Position: refs/heads/master@{#334820}
Diffstat (limited to 'components/components_tests.gyp')
-rw-r--r--components/components_tests.gyp1
1 files changed, 0 insertions, 1 deletions
diff --git a/components/components_tests.gyp b/components/components_tests.gyp
index 1b037f4..251f568 100644
--- a/components/components_tests.gyp
+++ b/components/components_tests.gyp
@@ -851,7 +851,6 @@
'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',
]