build/android.gypi - Issue 966773005: introduce android_x64 build target

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/android.gypi

Issue 966773005: introduce android_x64 build target (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@master

Patch Set: Created 5 years, 10 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:

Index: build/android.gypi

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

index 5d3b25a74636ca4b8bf430b94a7835673dd49dc4..98dc7950c459e485ed77a2384e36d6cb8cd68359 100644

--- a/build/android.gypi

+++ b/build/android.gypi

@@ -52,7 +52,13 @@

'android_stlport': '<(android_ndk_root)/sources/cxx-stl/stlport/',

'android_include': '<(android_sysroot)/usr/include',

- 'android_lib': '<(android_sysroot)/usr/lib',

+ 'conditions': [

+ ['target_arch=="x64"', {

Jakob Kummerow 2015/03/04 11:19:35 doesn't "arm64" need to be included in this list?

Weiliang 2015/03/05 03:22:36 From android-ndk, arm64 does not need to be includ

+ 'android_lib': '<(android_sysroot)/usr/lib64',

+ }, {

+ 'android_lib': '<(android_sysroot)/usr/lib',

+ }],

+ ],

'android_stlport_include': '<(android_stlport)/stlport',

'android_stlport_libs': '<(android_stlport)/libs',

}],