Linux: use generated library loader for gsettings.
BUG=162733
TEST=Test proxy settings on a system with GNOME3.
Review URL: https://codereview.chromium.org/11348279
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 3fc24f55e7037c7affdea50ffd57d1af4a7b87df
diff --git a/generate_library_loader.py b/generate_library_loader.py
index edf0706..07e8a09 100755
--- a/generate_library_loader.py
+++ b/generate_library_loader.py
@@ -146,6 +146,7 @@
parser.add_option('--output-h')
parser.add_option('--header')
+ parser.add_option('--bundled-header')
parser.add_option('--use-extern-c', action='store_true', default=False)
parser.add_option('--link-directly', type=int, default=0)
@@ -190,7 +191,10 @@
'unique_prefix': unique_prefix
})
- wrapped_header_include = '#include %s' % options.header
+ header = options.header
+ if options.link_directly == 0 and options.bundled_header:
+ header = options.bundled_header
+ wrapped_header_include = '#include %s\n' % header
# Some libraries (e.g. libpci) have headers that cannot be included
# without extern "C", otherwise they cause the link to fail.
