diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-30 21:22:34 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-30 21:22:34 +0000 |
| commit | 3fc24f55e7037c7affdea50ffd57d1af4a7b87df (patch) | |
| tree | 65b807f39346ac1818186f90d35dc96d9961e1ed /tools/generate_library_loader | |
| parent | c592624227c2cebdf18557be4b7c2b333e288e04 (diff) | |
| download | chromium_src-3fc24f55e7037c7affdea50ffd57d1af4a7b87df.zip chromium_src-3fc24f55e7037c7affdea50ffd57d1af4a7b87df.tar.gz chromium_src-3fc24f55e7037c7affdea50ffd57d1af4a7b87df.tar.bz2 | |
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
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@170544 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools/generate_library_loader')
| -rwxr-xr-x | tools/generate_library_loader/generate_library_loader.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/tools/generate_library_loader/generate_library_loader.py b/tools/generate_library_loader/generate_library_loader.py index edf0706..07e8a09 100755 --- a/tools/generate_library_loader/generate_library_loader.py +++ b/tools/generate_library_loader/generate_library_loader.py @@ -146,6 +146,7 @@ def main(): 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 @@ def main(): '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. |