Use gyp targets to link in X11 libraries instead of setting -lXfoo

ui/ui.gyp

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'variables': {
     'chromium_code': 1,
   },
   'targets': [
     {
@@ skipping 509 matching lines @@
               '$(SDKROOT)/System/Library/Frameworks/AudioUnit.framework',
               '$(SDKROOT)/System/Library/Frameworks/CoreVideo.framework',
             ],
           },
         }],
         ['use_x11==1', {
           'all_dependent_settings': {
             'ldflags': [
               '-L<(PRODUCT_DIR)',
             ],
+            # TODO(jamesr): Targets using X11 should declare dependencies on the
+            # appropriate build/linux/system.gyp targets themselves instead of
+            # independently picking it up from ui.
             'link_settings': {
               'libraries': [
                 '-lX11',
                 '-lXcursor',
-                '-lXrender',  # For XRender* function calls in x11_util.cc.
+                '-lXrender',
               ],
             },
           },
-          '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',
+            '../build/linux/system.gyp:xrender',  # For XRender* function calls in x11_util.cc.
           ],
         }],
         ['use_ozone==0', {
           'sources!': [
             'base/cursor/cursor_null.cc',
             'base/cursor/cursor_loader_null.cc',
             'base/cursor/cursor_loader_null.h',
           ],
         }],
         ['toolkit_views==0', {
@@ skipping 85 matching lines @@
            'variables': {
              'jni_gen_package': 'ui',
              'jni_generator_ptr_type': 'long',
            },
            'includes': [ '../build/jni_generator.gypi' ],
          },
        ],
     }],
   ],
 }