Remove WAYLAND port

Also removed skia/ext/canvas_paint_x.h which is not in use.

BUG=none
TEST=none

Review URL: https://chromiumcodereview.appspot.com/10009024

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@131219 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 0 insertions, 42 deletions

diff --git a/build/all.gyp b/build/all.gyp
index ee51f10..90afd5c 100644
--- a/build/all.gyp
+++ b/build/all.gyp
@@ -90,11 +90,6 @@
             }],
           ],
         }],
-        ['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 10105c8..9739cc1 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -518,9 +518,6 @@
     'force_rlz_use_chrome_net%': '<(force_rlz_use_chrome_net)',
     'enable_task_manager%': '<(enable_task_manager)',
 
-    # Whether to build for Wayland display server
-    'use_wayland%': 0,
-
     # Use system yasm instead of bundled one.
     'use_system_yasm%': 0,
 
@@ -1207,9 +1204,6 @@
       ['use_xi2_mt!=0', {
         'defines': ['USE_XI2_MT=<(use_xi2_mt)'],
       }],
-      ['use_wayland==1', {
-        'defines': ['USE_WAYLAND=1', 'WL_EGL_PLATFORM=1'],
-      }],
       ['file_manager_extension==1', {
         'defines': ['FILE_MANAGER_EXTENSION=1'],
       }],
diff --git a/build/filename_rules.gypi b/build/filename_rules.gypi
index 1de7e5d..d5a5a65 100644
--- a/build/filename_rules.gypi
+++ b/build/filename_rules.gypi
@@ -80,12 +80,5 @@
                     ['exclude', '(^|/)ash/'],
       ]
     }],
-    ['use_wayland!=1', {
-      'sources/': [
-        ['exclude', '_(wayland)(_unittest)?\\.(h|cc)$'],
-        ['exclude', '(^|/)wayland/'],
-        ['exclude', '(^|/)(wayland)_[^/]*\\.(h|cc)$'],
-      ],
-    }],
   ]
 }
diff --git a/build/linux/system.gyp b/build/linux/system.gyp
index 5170c10..b82c36c 100644
--- a/build/linux/system.gyp
+++ b/build/linux/system.gyp
@@ -609,30 +609,6 @@
       ],
     },
     {
-      'target_name': 'wayland',
-      'type': 'none',
-      'conditions': [
-        ['use_wayland == 1', {
-          'cflags': [
-            '<!@(<(pkg-config) --cflags cairo wayland-client wayland-egl xkbcommon)',
-          ],
-          'direct_dependent_settings': {
-            'cflags': [
-              '<!@(<(pkg-config) --cflags cairo wayland-client wayland-egl xkbcommon)',
-            ],
-          },
-          'link_settings': {
-            'ldflags': [
-              '<!@(<(pkg-config) --libs-only-L --libs-only-other wayland-client wayland-egl xkbcommon)',
-            ],
-            'libraries': [
-              '<!@(<(pkg-config) --libs-only-l wayland-client wayland-egl xkbcommon)',
-            ],
-          },
-        }],
-      ],
-    },
-    {
       'target_name': 'udev',
       'type': 'none',
       'conditions': [