Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / ui / ui.gyp

diff --git a/src/ui/ui.gyp b/src/ui/ui.gyp
index 28148e3..8215df1 100644 (file)
--- a/src/ui/ui.gyp
+++ b/src/ui/ui.gyp
@@ -127,13 +127,13 @@
         'base/cursor/cursor.h',
         'base/cursor/cursor_android.cc',
         'base/cursor/cursor_loader.h',
-        'base/cursor/cursor_loader_null.cc',
-        'base/cursor/cursor_loader_null.h',
+        'base/cursor/cursor_loader_ozone.cc',
+        'base/cursor/cursor_loader_ozone.h',
         'base/cursor/cursor_loader_win.cc',
         'base/cursor/cursor_loader_win.h',
         'base/cursor/cursor_loader_x11.cc',
         'base/cursor/cursor_loader_x11.h',
-        'base/cursor/cursor_null.cc',
+        'base/cursor/cursor_ozone.cc',
         'base/cursor/cursor_mac.mm',
         'base/cursor/cursor_win.cc',
         'base/cursor/cursor_x11.cc',
@@ -527,32 +527,13 @@
             'ldflags': [
               '-L<(PRODUCT_DIR)',
             ],
-            'link_settings': {
-              'libraries': [
-                '-lX11',
-                '-lXcursor',
-                '-lXrender',  # For XRender* function calls in x11_util.cc.
-              ],
-            },
-          },
-          'link_settings': {
-            'libraries': [
-              '-lX11',
-              '-lXcursor',
-              '-lXrender',  # For XRender* function calls in x11_util.cc.
-            ],
           },
           'dependencies': [
             '../build/linux/system.gyp:x11',
+            '../build/linux/system.gyp:xcursor',
             '../build/linux/system.gyp:xext',
             '../build/linux/system.gyp:xfixes',
-          ],
-        }],
-        ['use_ozone==0', {
-          'sources!': [
-            'base/cursor/cursor_null.cc',
-            'base/cursor/cursor_loader_null.cc',
-            'base/cursor/cursor_loader_null.h',
+            '../build/linux/system.gyp:xrender',  # For XRender* function calls in x11_util.cc.
           ],
         }],
         ['toolkit_views==0', {