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 /gpu/gles2_conform_support | |
| 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 'gpu/gles2_conform_support')
| -rw-r--r-- | gpu/gles2_conform_support/gles2_conform_support.gyp | 2 | ||||
| -rw-r--r-- | gpu/gles2_conform_support/native/egl_native_x11.cc (renamed from gpu/gles2_conform_support/native/egl_native_linux.cc) | 0 |
2 files changed, 1 insertions, 1 deletions
diff --git a/gpu/gles2_conform_support/gles2_conform_support.gyp b/gpu/gles2_conform_support/gles2_conform_support.gyp index a4715b6..94ebebf 100644 --- a/gpu/gles2_conform_support/gles2_conform_support.gyp +++ b/gpu/gles2_conform_support/gles2_conform_support.gyp @@ -14,7 +14,7 @@ ['OS=="linux"', { 'bootstrap_sources_native': [ 'native/egl_native.cc', - 'native/egl_native_linux.cc', + 'native/egl_native_x11.cc', ], }], ['OS=="win"', { diff --git a/gpu/gles2_conform_support/native/egl_native_linux.cc b/gpu/gles2_conform_support/native/egl_native_x11.cc index c57a6f5..c57a6f5 100644 --- a/gpu/gles2_conform_support/native/egl_native_linux.cc +++ b/gpu/gles2_conform_support/native/egl_native_x11.cc |