diff options
| author | dnicoara@chromium.org <dnicoara@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-11 18:20:22 +0000 |
|---|---|---|
| committer | dnicoara@chromium.org <dnicoara@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-11 18:20:22 +0000 |
| commit | 4076d2f06b0a9276136436cc1836e3fba8c8ff97 (patch) | |
| tree | 735b7ed091c74e52142cbc7759aa46f761535b86 /build | |
| parent | f9cdd2a4a1c064d6666816a703e0d84fca555f5f (diff) | |
| download | chromium_src-4076d2f06b0a9276136436cc1836e3fba8c8ff97.zip chromium_src-4076d2f06b0a9276136436cc1836e3fba8c8ff97.tar.gz chromium_src-4076d2f06b0a9276136436cc1836e3fba8c8ff97.tar.bz2 | |
Adding Wayland message loop and gyp build deps
This CL depends on http://codereview.chromium.org/7457023
BUG=
TEST=
Review URL: http://codereview.chromium.org/7473010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@96428 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/all.gyp | 5 | ||||
| -rw-r--r-- | build/common.gypi | 5 |
2 files changed, 7 insertions, 3 deletions
diff --git a/build/all.gyp b/build/all.gyp index 6540c07..920b39a 100644 --- a/build/all.gyp +++ b/build/all.gyp @@ -93,6 +93,11 @@ }], ], }], + ['use_wayland == 1', { + 'dependencies': [ + '../ui/wayland/wayland.gyp:*', + ], + }], ['toolkit_uses_gtk==1', { 'dependencies': [ '../tools/gtk_clipboard_dump/gtk_clipboard_dump.gyp:*', diff --git a/build/common.gypi b/build/common.gypi index e807099..651c118 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -90,8 +90,6 @@ 'toolkit_views%': '<(toolkit_views)', 'toolkit_uses_pure_views%': '<(toolkit_uses_pure_views)', 'views_compositor%': '<(views_compositor)', - # Whether to build for Wayland display server - 'use_wayland%': 0, # We used to provide a variable for changing how libraries were built. # This variable remains until we can clean up all the users. @@ -310,7 +308,8 @@ 'clang_use_chrome_plugins%': '<(clang_use_chrome_plugins)', 'enable_register_protocol_handler%': '<(enable_register_protocol_handler)', 'enable_smooth_scrolling%': '<(enable_smooth_scrolling)', - 'use_wayland%': '<(use_wayland)', + # Whether to build for Wayland display server + 'use_wayland%': 0, # The release channel that this build targets. This is used to restrict # channel-specific build options, like which installer packages to create. |