Revert of linux/gyp: Find missing symbols at build time, not runtime.…

… (patchset chromium#9 id:160001 of https://codereview.chromium.org/854753002/) Reason for revert: Broke Ozone: http://build.chromium.org/p/chromium.chromiumos/builders/Linux%20ChromiumOS%20Ozone%20Builder/builds/10001 gyp: Dependency '/b/build/slave/Linux_ChromiumOS_Ozone_Builder/build/src/build/linux/system.gyp:x11#target' not found while trying to load target /b/build/slave/Linux_ChromiumOS_Ozone_Builder/build/src/content/content_shell_and_tests.gyp:test_netscape_plugin#target Original issue's description: > linux/gyp: Find missing symbols at build time, not runtime. > > Limited to very few cases for now (non-chromeos, non-android, > non-official, component builds only). > > BUG=371125 > TBR=piman,dalecurtis > > Committed: https://crrev.com/faffc1a04d17dd977ff9eb335c0c67b3b86dad5e > Cr-Commit-Position: refs/heads/master@{#312020} TBR=jamesr@chromium.org,piman@chromium.org,dalecurtis@chromium.org,thakis@chromium.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=371125 Review URL: https://codereview.chromium.org/851313004 Cr-Commit-Position: refs/heads/master@{#312028}
hylschwy · Jan 17, 2015 · c160801 · c160801
1 parent 4e78490
commit c160801
Show file tree

Hide file tree

Showing 16 changed files with 0 additions and 56 deletions.
diff --git a/ash/ash.gyp b/ash/ash.gyp
@@ -897,7 +897,6 @@
         '../ui/events/events.gyp:events',
         '../ui/events/events.gyp:events_base',
         '../ui/events/events.gyp:gesture_detection',
-        '../ui/events/platform/events_platform.gyp:events_platform',
         '../ui/gfx/gfx.gyp:gfx',
         '../ui/gfx/gfx.gyp:gfx_geometry',
         '../ui/keyboard/keyboard.gyp:keyboard',
@@ -930,9 +929,7 @@
         }],
         ['use_x11==1', {
           'dependencies': [
-            '../build/linux/system.gyp:x11',
             '../build/linux/system.gyp:xfixes',
-            '../ui/gfx/x/gfx_x11.gyp:gfx_x11',
            ],
         }],
         ['use_ozone==1', {

diff --git a/build/common.gypi b/build/common.gypi
@@ -3534,14 +3534,6 @@
         ],
       },
     }],
-    # TODO(thakis): Enable this everywhere. http://crbug.com/371125
-    ['OS=="linux" and chromeos==0 and component=="shared_library" and use_ozone!=1 and buildtype!="Official"', {
-      'target_defaults': {
-        'ldflags': [
-          '-Wl,-z,defs',
-        ],
-      },
-    }],
     ['os_posix==1 and chromeos==0', {
       # Chrome OS enables -fstack-protector-strong via its build wrapper,
       # and we want to avoid overriding this, so stack-protector is only

diff --git a/chrome/browser/ui/libgtk2ui/libgtk2ui.gyp b/chrome/browser/ui/libgtk2ui/libgtk2ui.gyp
@@ -18,21 +18,11 @@
         '../../../../build/linux/system.gyp:gconf',
         '../../../../build/linux/system.gyp:gtk',
         '../../../../build/linux/system.gyp:gtkprint',
-        '../../../../build/linux/system.gyp:x11',
         '../../../../components/components_resources.gyp:components_resources',
-        '../../../../content/content.gyp:content',
         '../../../../printing/printing.gyp:cups',
-        '../../../../printing/printing.gyp:printing',
         '../../../../skia/skia.gyp:skia',
-        '../../../../ui/aura/aura.gyp:aura',
         '../../../../ui/base/ui_base.gyp:ui_base',
-        '../../../../ui/events/events.gyp:events',
-        '../../../../ui/events/events.gyp:events_base',
-        '../../../../ui/gfx/gfx.gyp:gfx',
-        '../../../../ui/gfx/x/gfx_x11.gyp:gfx_x11',
-        '../../../../ui/native_theme/native_theme.gyp:native_theme',
         '../../../../ui/resources/ui_resources.gyp:ui_resources',
-        '../../../../ui/shell_dialogs/shell_dialogs.gyp:shell_dialogs',
         '../../../../ui/strings/ui_strings.gyp:ui_strings',
         '../../../../ui/views/views.gyp:views',
         '../../../chrome_resources.gyp:chrome_extra_resources',

diff --git a/content/content_browser.gypi b/content/content_browser.gypi
@@ -1813,8 +1813,6 @@
     ['use_x11==1', {
       'dependencies': [
         '../build/linux/system.gyp:x11',
-        '../ui/events/platform/x11/x11_events_platform.gyp:x11_events_platform',
-        '../ui/gfx/x/gfx_x11.gyp:gfx_x11',
       ],
     }],
     ['use_pango==1', {

diff --git a/content/content_shell.gypi b/content/content_shell.gypi
@@ -732,9 +732,6 @@
             '-fvisibility=default',
           ],
         }],
-        ['OS == "linux"', {
-          'dependencies': [ '../build/linux/system.gyp:x11' ],
-        }],
         ['OS=="win"', {
           'defines': [
             # This seems like a hack, but this is what Safari Win does.

diff --git a/gpu/gpu_config.gypi b/gpu/gpu_config.gypi
@@ -75,7 +75,6 @@
         '../build/linux/system.gyp:x11',
         '../build/linux/system.gyp:xext',
         '../third_party/libXNVCtrl/libXNVCtrl.gyp:libXNVCtrl',
-        '../ui/gfx/x/gfx_x11.gyp:gfx_x11',
       ],
     }],
   ],

diff --git a/media/media.gyp b/media/media.gyp
@@ -759,7 +759,6 @@
                 '../build/linux/system.gyp:xext',
                 '../build/linux/system.gyp:xfixes',
                 '../build/linux/system.gyp:xtst',
-                '../ui/gfx/x/gfx_x11.gyp:gfx_x11',
               ],
             }, {  # else: use_x11==0
               'sources!': [

diff --git a/media/media_cdm.gypi b/media/media_cdm.gypi
@@ -145,7 +145,6 @@
               # Because clearkeycdm has type 'loadable_module' (see comments),
               # we must explicitly specify this dependency.
               'libraries': [
-               '-lrt',
                 # Built by clearkeycdm.
                 '<(PRODUCT_DIR)/libclearkeycdm.so',
               ],

diff --git a/third_party/mesa/mesa.gyp b/third_party/mesa/mesa.gyp
@@ -682,15 +682,6 @@
             'KEYWORD2=GLAPIENTRY',
           ],
         }],
-        ['OS=="linux"', {
-          'link_settings': {
-            'libraries': [
-              '-ldl',
-              '-lm',
-              '-lstdc++',
-            ],
-          },
-        }],
       ],
       'include_dirs': [
         'src/src/mapi',

diff --git a/ui/aura/aura.gyp b/ui/aura/aura.gyp
@@ -119,9 +119,7 @@
             '../../build/linux/system.gyp:x11',
             '../../build/linux/system.gyp:xrandr',
             '../../build/linux/system.gyp:xi',
-            '../events/devices/events_devices.gyp:events_devices',
             '../events/platform/x11/x11_events_platform.gyp:x11_events_platform',
-            '../gfx/x/gfx_x11.gyp:gfx_x11',
           ],
         }],
         ['OS=="win"', {

diff --git a/ui/base/ui_base.gyp b/ui/base/ui_base.gyp
@@ -623,9 +623,7 @@
             '../../build/linux/system.gyp:xext',
             '../../build/linux/system.gyp:xfixes',
             '../../build/linux/system.gyp:xrender',  # For XRender* function calls in x11_util.cc.
-            '../events/devices/events_devices.gyp:events_devices',
             '../events/platform/x11/x11_events_platform.gyp:x11_events_platform',
-            '../gfx/x/gfx_x11.gyp:gfx_x11',
           ],
         }],
         ['use_x11==1 and chromeos==0', {

diff --git a/ui/display/display.gyp b/ui/display/display.gyp
@@ -115,7 +115,6 @@
       'conditions': [
         ['use_x11 == 1', {
           'dependencies': [
-            '../../build/linux/system.gyp:x11',
             '../../build/linux/system.gyp:xrandr',
             '../../ui/gfx/x/gfx_x11.gyp:gfx_x11',
           ],

diff --git a/ui/events/events.gyp b/ui/events/events.gyp
@@ -143,7 +143,6 @@
         ['use_x11==1', {
           'dependencies': [
             'devices/events_devices.gyp:events_devices',
-            '../gfx/x/gfx_x11.gyp:gfx_x11',
             '../../build/linux/system.gyp:x11',
           ],
         }],

diff --git a/ui/events/platform/x11/x11_events_platform.gyp b/ui/events/platform/x11/x11_events_platform.gyp
@@ -14,7 +14,6 @@
       'EVENTS_IMPLEMENTATION',
     ],
     'dependencies': [
-      '../../../../base/base.gyp:base',
       '../../../../build/linux/system.gyp:x11',
       '../../../gfx/x/gfx_x11.gyp:gfx_x11',
       '../../devices/events_devices.gyp:events_devices',

diff --git a/ui/views/views.gyp b/ui/views/views.gyp
@@ -679,7 +679,6 @@
             '../../build/linux/system.gyp:xrandr',
             '../events/devices/events_devices.gyp:events_devices',
             '../events/platform/x11/x11_events_platform.gyp:x11_events_platform',
-            '../gfx/x/gfx_x11.gyp:gfx_x11',
           ],
         }],
         ['use_aura==1', {
@@ -699,9 +698,6 @@
             }],
             ['use_x11 == 1', {
               'sources': [ '<@(views_desktop_aura_x11_sources)' ],
-              'dependencies': [
-                '../../build/linux/system.gyp:xext',
-              ],
             }],
             ['OS == "win"', {
               'sources': [ '<@(views_desktop_aura_win_sources)' ],

diff --git a/ui/wm/wm.gyp b/ui/wm/wm.gyp
@@ -95,13 +95,6 @@
         'core/wm_state.h',
         'wm_export.h',
       ],
-      'conditions': [
-        ['use_x11==1', {
-          'dependencies': [
-            '../../build/linux/system.gyp:x11',
-          ],
-        }],
-      ],
     },
     {
       # GN version: //ui/wm:test_support