Issue 20083003: Work around gyp nested merge problem in shim_headers.gypi.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Issue 20083003: Work around gyp nested merge problem in shim_headers.gypi. (Closed)

Created:
7 years, 5 months ago by Torne

Modified:
7 years, 5 months ago

Reviewers:
benm (inactive), Paweł Hajdan Jr.

CC:
chromium-reviews

Base URL:
svn://svn.chromium.org/chrome/trunk/src

Visibility:
Public.

More Reviews

Description

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 Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=213470