diff options
| author | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-12 17:31:44 +0000 |
|---|---|---|
| committer | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-12 17:31:44 +0000 |
| commit | 9e7a916001ca82d2b4fcfb8380efa66a4f9e97fb (patch) | |
| tree | 41336d2f71061216d585ac233bff2e75080f80d7 /build | |
| parent | d738857a73566e03820bfc3c826585f62db378c9 (diff) | |
| download | chromium_src-9e7a916001ca82d2b4fcfb8380efa66a4f9e97fb.zip chromium_src-9e7a916001ca82d2b4fcfb8380efa66a4f9e97fb.tar.gz chromium_src-9e7a916001ca82d2b4fcfb8380efa66a4f9e97fb.tar.bz2 | |
x11: Split the gfx_x11 target into its own gyp file.
Add a gfx_x11.gyp in //ui/gfx/x/ and define the gfx_x11 target in there,
instead of defining it conditionally in //ui/gfx/gfx.gyp. This allows
including this code from particular components even when X11 is turned
off.
BUG=361137
R=piman@chromium.org, sky@chromium.org
Review URL: https://codereview.chromium.org/275273002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@269804 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/common.gypi | 2 | ||||
| -rw-r--r-- | build/linux/system.gyp | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/build/common.gypi b/build/common.gypi index 3e18a4b..6d076bb 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -2116,10 +2116,12 @@ # Enable built-in ozone platforms if ozone is enabled. 'ozone_platform_caca%': 0, 'ozone_platform_dri%': 1, + 'ozone_platform_ozonex%': 0, 'ozone_platform_test%': 1, }, { # use_ozone==0 'ozone_platform_caca%': 0, 'ozone_platform_dri%': 0, + 'ozone_platform_ozonex%': 0, 'ozone_platform_test%': 0, }], diff --git a/build/linux/system.gyp b/build/linux/system.gyp index 4a3fa32..84bfbbf 100644 --- a/build/linux/system.gyp +++ b/build/linux/system.gyp @@ -111,7 +111,7 @@ }, ], # targets }], - [ 'use_x11==1', { + [ 'use_x11==1 or ozone_platform_ozonex==1', { # Hide X11 and related dependencies when use_x11=0 'targets': [ { |