Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1023)

Unified Diff: content/content_gpu.gypi

Issue 11415138: Linux: create a library loader code generator for dlopen and use it for libpci. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 8 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « build/linux/system.gyp ('k') | content/gpu/gpu_info_collector_linux.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/content_gpu.gypi
diff --git a/content/content_gpu.gypi b/content/content_gpu.gypi
index 6b05cded06fe05e42c8b4a30a9eec2341c5bd208..66cb3c682adde8189014aaaef2d38b73d4f4c0c0 100644
--- a/content/content_gpu.gypi
+++ b/content/content_gpu.gypi
@@ -3,9 +3,6 @@
# found in the LICENSE file.
{
- 'variables': {
- 'linux_link_libpci%': 0,
- },
'dependencies': [
'../base/base.gyp:base',
'../skia/skia.gyp:skia',
@@ -100,6 +97,7 @@
}],
['OS=="linux"', {
'dependencies': [
+ '../build/linux/system.gyp:libpci',
'../third_party/libXNVCtrl/libXNVCtrl.gyp:libXNVCtrl',
],
}],
@@ -113,22 +111,5 @@
'<(DEPTH)/third_party/libva',
],
}],
- ['linux_link_libpci==0', {
- 'defines': [
- 'DLOPEN_LIBPCI',
- ],
- }, { # linux_link_libpci==1
- 'cflags': [
- '<!@(pkg-config --cflags libpci)',
- ],
- 'link_settings': {
- 'ldflags': [
- '<!@(pkg-config --libs-only-L --libs-only-other libpci)',
- ],
- 'libraries': [
- '<!@(pkg-config --libs-only-l libpci)',
- ],
- }
- }],
],
}
« no previous file with comments | « build/linux/system.gyp ('k') | content/gpu/gpu_info_collector_linux.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698