diff options
| author | torne@chromium.org <torne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-26 21:26:01 +0000 |
|---|---|---|
| committer | torne@chromium.org <torne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-26 21:26:01 +0000 |
| commit | 6c6361d31df0f6397092bba0659230bcad7ef88c (patch) | |
| tree | 51aaefa1b8ecf8e28a9e46a9dbfce2c816d16d2a /tools/generate_shim_headers | |
| parent | 45ce685e8bf53bfab441ed67b58b2cde07e8d3bf (diff) | |
| download | chromium_src-6c6361d31df0f6397092bba0659230bcad7ef88c.zip chromium_src-6c6361d31df0f6397092bba0659230bcad7ef88c.tar.gz chromium_src-6c6361d31df0f6397092bba0659230bcad7ef88c.tar.bz2 | |
Android WebView: use the system ashmem.
We are already pulling in the system ashmem via other system libraries,
so compiling a second copy into chrome causes linker issues. Use the
system version in Chromium as well when building WebView as part of the
Android build.
BUG=157326
Review URL: https://chromiumcodereview.appspot.com/12674026
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@190771 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools/generate_shim_headers')
| -rwxr-xr-x | tools/generate_shim_headers/generate_shim_headers.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tools/generate_shim_headers/generate_shim_headers.py b/tools/generate_shim_headers/generate_shim_headers.py index 891b75c..81c531b 100755 --- a/tools/generate_shim_headers/generate_shim_headers.py +++ b/tools/generate_shim_headers/generate_shim_headers.py @@ -29,6 +29,7 @@ def GeneratorMain(argv): parser.add_option('--headers-root', action='append') parser.add_option('--define', action='append') parser.add_option('--output-directory') + parser.add_option('--prefix', default='') parser.add_option('--use-include-next', action='store_true') parser.add_option('--outputs', action='store_true') parser.add_option('--generate', action='store_true') @@ -80,10 +81,11 @@ def GeneratorMain(argv): for header in include_before.split(':'): f.write('#include %s\n' % header) + include_target = options.prefix + header_filename if options.use_include_next: - f.write('#include_next <%s>\n' % header_filename) + f.write('#include_next <%s>\n' % include_target) else: - f.write('#include <%s>\n' % header_filename) + f.write('#include <%s>\n' % include_target) if include_after: for header in include_after.split(':'): |