diff options
| author | Sadrul Habib Chowdhury <sadrul@chromium.org> | 2015-06-17 03:06:23 -0400 |
|---|---|---|
| committer | Sadrul Habib Chowdhury <sadrul@chromium.org> | 2015-06-17 07:07:54 +0000 |
| commit | c13fc9ff0aedca62ebfdfc27d44c6b5ac204c9d8 (patch) | |
| tree | b63742b7b3bae9feb72e45134384322813bc1312 /build | |
| parent | bb3d972d5787ed3d6e9116ddc1c4a20a1a5de30c (diff) | |
| download | chromium_src-c13fc9ff0aedca62ebfdfc27d44c6b5ac204c9d8.zip chromium_src-c13fc9ff0aedca62ebfdfc27d44c6b5ac204c9d8.tar.gz chromium_src-c13fc9ff0aedca62ebfdfc27d44c6b5ac204c9d8.tar.bz2 | |
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
Review URL: https://codereview.chromium.org/1175603002.
Cr-Commit-Position: refs/heads/master@{#334785}
Diffstat (limited to 'build')
| -rw-r--r-- | build/common.gypi | 3 | ||||
| -rw-r--r-- | build/config/BUILD.gn | 3 |
2 files changed, 0 insertions, 6 deletions
diff --git a/build/common.gypi b/build/common.gypi index 4d548b2..32c49a1 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -2663,9 +2663,6 @@ ['component=="shared_library"', { 'defines': ['COMPONENT_BUILD'], }], - ['toolkit_views==1', { - 'defines': ['TOOLKIT_VIEWS=1'], - }], ['ui_compositor_image_transport==1', { 'defines': ['UI_COMPOSITOR_IMAGE_TRANSPORT'], }], diff --git a/build/config/BUILD.gn b/build/config/BUILD.gn index f28f0cf..d1e6ee7 100644 --- a/build/config/BUILD.gn +++ b/build/config/BUILD.gn @@ -90,9 +90,6 @@ config("feature_flags") { # TODO(brettw) should probably be "=1". defines += [ "USE_UDEV" ] } - if (toolkit_views) { - defines += [ "TOOLKIT_VIEWS=1" ] - } if (ui_compositor_image_transport) { # TODO(brettw) should probably be "=1". defines += [ "UI_COMPOSITOR_IMAGE_TRANSPORT" ] |