build/common.gypi - Issue 10375049: Fix the incorrect include headers in 64-bit arch host for android x86 build

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

Unified Diff: build/common.gypi

Issue 10375049: Fix the incorrect include headers in 64-bit arch host for android x86 build (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: Created 8 years, 7 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: build/common.gypi

diff --git a/build/common.gypi b/build/common.gypi

index 04a3dbe3b7c2d3b1c46b3929e7d8156e05e178a9..b895c518a4bbbc60d5d942e915fc0a7d91a5166f 100644

--- a/build/common.gypi

+++ b/build/common.gypi

@@ -2037,7 +2037,8 @@

# versions, so we have to shadow those differences off

# and make sure a 32-bit-on-64-bit build picks up the

# right files.

- ['host_arch!="ia32"', {

+ # For android build, use NDK headers instead of host headers

+ ['host_arch!="ia32" and OS!="android"', {

'include_dirs+': [

'/usr/include32',

« no previous file with comments | « no previous file | no next file » | no next file with comments »