summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorthakis <thakis@chromium.org>2015-01-18 21:42:29 -0800
committerCommit bot <commit-bot@chromium.org>2015-01-19 05:43:41 +0000
commit603fc87a206153f76349350905785b9139ea231d (patch)
tree2f8525924dc05dca6cdef7153efda7ffd331a5f1
parent812079fc8d39ad8bcffc3f86f96be449ae19cba2 (diff)
downloadchromium_src-603fc87a206153f76349350905785b9139ea231d.zip
chromium_src-603fc87a206153f76349350905785b9139ea231d.tar.gz
chromium_src-603fc87a206153f76349350905785b9139ea231d.tar.bz2
Revert of Revert of linux/gyp: Find missing symbols at build time, not runtime. (patchset #1 id:1 of https://codereview.chromium.org/835223006/)
Reason for revert: not on cq => doesn't qualify for reverts. will fix live. Original issue's description: > Revert of linux/gyp: Find missing symbols at build time, not runtime. (patchset #10 id:180001 of https://codereview.chromium.org/854753002/) > > Reason for revert: > Breaks compile on chromium.webkit/Linux Tests (dbg) and probably also chromium.lkgr/ASAN Debug > > http://build.chromium.org/p/chromium.webkit/builders/Linux%20Tests%20%28dbg%29?numbuilds=50 > http://build.chromium.org/p/chromium.lkgr/builders/ASAN%20Debug > > 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} > > > > Committed: https://crrev.com/fdaea4c9e63c845db9c009d236205e7ed4fcb663 > > Cr-Commit-Position: refs/heads/master@{#312032} > > TBR=jamesr@chromium.org,piman@chromium.org,dalecurtis@chromium.org,machenbach@chromium.org,thakis@chromium.org > NOPRESUBMIT=true > NOTREECHECKS=true > NOTRY=true > BUG=371125 > > Committed: https://crrev.com/6019325be9a7a4195368d8d4362047e1a4381541 > Cr-Commit-Position: refs/heads/master@{#312068} TBR=jamesr@chromium.org,piman@chromium.org,dalecurtis@chromium.org,machenbach@chromium.org,timloh@chromium.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=371125 Review URL: https://codereview.chromium.org/860623002 Cr-Commit-Position: refs/heads/master@{#312070}
Diffstat
-rw-r--r--ash/ash.gyp3
-rw-r--r--build/common.gypi8
-rw-r--r--chrome/browser/ui/libgtk2ui/libgtk2ui.gyp10
-rw-r--r--content/content_browser.gypi2
-rw-r--r--content/content_shell.gypi3
-rw-r--r--gpu/gpu_config.gypi1
-rw-r--r--media/media.gyp1
-rw-r--r--media/media_cdm.gypi1
-rw-r--r--third_party/mesa/mesa.gyp9
-rw-r--r--ui/aura/aura.gyp2
-rw-r--r--ui/base/ui_base.gyp2
-rw-r--r--ui/display/display.gyp1
-rw-r--r--ui/events/events.gyp1
-rw-r--r--ui/events/platform/x11/x11_events_platform.gyp1
-rw-r--r--ui/views/views.gyp4
-rw-r--r--ui/wm/wm.gyp7
16 files changed, 56 insertions, 0 deletions
diff --git a/ash/ash.gyp b/ash/ash.gyp
index 639fa84..5e6a4dc 100644
--- a/ash/ash.gyp
+++ b/ash/ash.gyp
@@ -897,6 +897,7 @@
'../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',
@@ -929,7 +930,9 @@
}],
['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
index 58184d6..29318a6 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -3534,6 +3534,14 @@
],
},
}],
+ # 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
index d66b00c..c52bc11 100644
--- a/chrome/browser/ui/libgtk2ui/libgtk2ui.gyp
+++ b/chrome/browser/ui/libgtk2ui/libgtk2ui.gyp
@@ -18,11 +18,21 @@
'../../../../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
index 7d77bd3..f5fa1f8 100644
--- a/content/content_browser.gypi
+++ b/content/content_browser.gypi
@@ -1813,6 +1813,8 @@
['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
index 1692ac7..9709702 100644
--- a/content/content_shell.gypi
+++ b/content/content_shell.gypi
@@ -732,6 +732,9 @@
'-fvisibility=default',
],
}],
+ ['use_x11 == 1', {
+ '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
index 4505503..98b19aa 100644
--- a/gpu/gpu_config.gypi
+++ b/gpu/gpu_config.gypi
@@ -75,6 +75,7 @@
'../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
index 9aba019..5b7f026 100644
--- a/media/media.gyp
+++ b/media/media.gyp
@@ -759,6 +759,7 @@
'../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
index 6c8452a..85c8276 100644
--- a/media/media_cdm.gypi
+++ b/media/media_cdm.gypi
@@ -145,6 +145,7 @@
# 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
index 3db0d4c..bf2afcd 100644
--- a/third_party/mesa/mesa.gyp
+++ b/third_party/mesa/mesa.gyp
@@ -682,6 +682,15 @@
'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
index e64f6eb..41a411f 100644
--- a/ui/aura/aura.gyp
+++ b/ui/aura/aura.gyp
@@ -119,7 +119,9 @@
'../../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
index 1115a09..f8f4eef 100644
--- a/ui/base/ui_base.gyp
+++ b/ui/base/ui_base.gyp
@@ -623,7 +623,9 @@
'../../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
index 0d15042..e299c6b 100644
--- a/ui/display/display.gyp
+++ b/ui/display/display.gyp
@@ -115,6 +115,7 @@
'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
index 7eea183..8548924 100644
--- a/ui/events/events.gyp
+++ b/ui/events/events.gyp
@@ -143,6 +143,7 @@
['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
index b056ab6..cb1bbcd 100644
--- a/ui/events/platform/x11/x11_events_platform.gyp
+++ b/ui/events/platform/x11/x11_events_platform.gyp
@@ -14,6 +14,7 @@
'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
index e20e8f8..a4ba9c3 100644
--- a/ui/views/views.gyp
+++ b/ui/views/views.gyp
@@ -679,6 +679,7 @@
'../../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', {
@@ -698,6 +699,9 @@
}],
['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
index fa71587..7336922 100644
--- a/ui/wm/wm.gyp
+++ b/ui/wm/wm.gyp
@@ -95,6 +95,13 @@
'core/wm_state.h',
'wm_export.h',
],
+ 'conditions': [
+ ['use_x11==1', {
+ 'dependencies': [
+ '../../build/linux/system.gyp:x11',
+ ],
+ }],
+ ],
},
{
# GN version: //ui/wm:test_support
generated by cgit v1.1 at 2025-01-10 23:24:24 +0000