diff options
| author | torne@chromium.org <torne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-24 18:29:07 +0000 |
|---|---|---|
| committer | torne@chromium.org <torne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-24 18:29:07 +0000 |
| commit | 950be1caf59c9a02e8e6762bd0129b0e661d99c7 (patch) | |
| tree | 79a14f3cda5a74036f246e9d64418458b0439e21 /build/shim_headers.gypi | |
| parent | d1c6b7bd5718491b73e35839b32fa3da81471e90 (diff) | |
| download | chromium_src-950be1caf59c9a02e8e6762bd0129b0e661d99c7.zip chromium_src-950be1caf59c9a02e8e6762bd0129b0e661d99c7.tar.gz chromium_src-950be1caf59c9a02e8e6762bd0129b0e661d99c7.tar.bz2 | |
Work around gyp nested merge problem in shim_headers.gypi.
Workaround for ICU build problem in Android WebView. ICU includes
shim_headers.gypi inside a conditions block, which causes one extra
level of + to be stripped, which causes the resulting include dir to be
added at the end, not the start, of the include path. The compiler was
then picking up the wrong headers for the library. Fix by duplicating
the include_dirs block with one extra plus; gyp will de-duplicate the
result in favour of the earlier one.
BUG=263818
Review URL: https://chromiumcodereview.appspot.com/20083003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@213470 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/shim_headers.gypi')
| -rw-r--r-- | build/shim_headers.gypi | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/build/shim_headers.gypi b/build/shim_headers.gypi index 0c885be..4291468 100644 --- a/build/shim_headers.gypi +++ b/build/shim_headers.gypi @@ -20,6 +20,9 @@ 'include_dirs+++': [ '<(shim_headers_path)', ], + 'include_dirs++++': [ + '<(shim_headers_path)', + ], }, 'actions': [ { |