diff options
| author | davemoore@chromium.org <davemoore@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-29 18:13:12 +0000 |
|---|---|---|
| committer | davemoore@chromium.org <davemoore@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-29 18:13:12 +0000 |
| commit | 2fa2f2d8bcd5f8fa812723c442bb54f2328ad93e (patch) | |
| tree | bbadbc7c214c5d8adda40904607090f24e70b490 /ui/ui.gyp | |
| parent | 40a7e41b4820be63de44ece14c70b3bfe7e4c564 (diff) | |
| download | chromium_src-2fa2f2d8bcd5f8fa812723c442bb54f2328ad93e.zip chromium_src-2fa2f2d8bcd5f8fa812723c442bb54f2328ad93e.tar.gz chromium_src-2fa2f2d8bcd5f8fa812723c442bb54f2328ad93e.tar.bz2 | |
Rationalize linux vs x11 in ui
BUG=236170
TEST=None
R=ben@chromium.org
Review URL: https://codereview.chromium.org/13985039
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@197087 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/ui.gyp')
| -rw-r--r-- | ui/ui.gyp | 8 |
1 files changed, 7 insertions, 1 deletions
@@ -269,7 +269,7 @@ 'base/resource/resource_bundle.cc', 'base/resource/resource_bundle.h', 'base/resource/resource_bundle_android.cc', - 'base/resource/resource_bundle_aurax11.cc', + 'base/resource/resource_bundle_auralinux.cc', 'base/resource/resource_bundle_gtk.cc', 'base/resource/resource_bundle_ios.mm', 'base/resource/resource_bundle_mac.mm', @@ -635,6 +635,12 @@ 'base/x/selection_utils.h', ] }], + + ['use_aura==0 or OS!="linux"', { + 'sources!': [ + 'base/resource/resource_bundle_auralinux.cc', + ], + }], ['use_aura==1 and OS=="win"', { 'sources/': [ ['exclude', 'base/dragdrop/drag_utils_aura.cc'], |