build/common.gypi - Issue 256803008: For x64 set android_ndk_lib to /usr/lib64.

Unified Diff: build/common.gypi

Issue 256803008: For x64 set android_ndk_lib to /usr/lib64. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Update for Ross' comments Created 6 years, 8 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 e94ed2c8bdd7b9051dd05172a1c897765b699e28..229ada7a39e4bf129ea00e3f14943166794a72fb 100644

--- a/build/common.gypi

+++ b/build/common.gypi

@@ -1521,12 +1521,14 @@

'android_app_abi%': 'x86',

'android_gdbserver%': '<(android_ndk_root)/prebuilt/android-x86/gdbserver/gdbserver',

'android_ndk_sysroot%': '<(android_ndk_root)/platforms/android-14/arch-x86',

+ 'android_ndk_lib_dir': '/usr/lib',

'android_toolchain%': '<(android_ndk_root)/toolchains/x86-4.6/prebuilt/<(host_os)-<(android_host_arch)/bin',

}],

['target_arch == "x64"', {

'android_app_abi%': 'x86_64',

'android_gdbserver%': '<(android_ndk_experimental_root)/prebuilt/android-x86_64/gdbserver/gdbserver',

'android_ndk_sysroot%': '<(android_ndk_experimental_root)/platforms/android-20/arch-x86_64',

+ 'android_ndk_lib_dir%': '/usr/lib64',

'android_toolchain%': '<(android_ndk_experimental_root)/toolchains/x86_64-4.8/prebuilt/<(host_os)-<(android_host_arch)/bin',

'android_stlport_root': '<(android_ndk_experimental_root)/sources/cxx-stl/stlport',

}],

@@ -1540,12 +1542,14 @@

'android_gdbserver%': '<(android_ndk_root)/prebuilt/android-arm/gdbserver/gdbserver',

'android_ndk_sysroot%': '<(android_ndk_root)/platforms/android-14/arch-arm',

+ 'android_ndk_lib_dir': '/usr/lib',

'android_toolchain%': '<(android_ndk_root)/toolchains/arm-linux-androideabi-4.6/prebuilt/<(host_os)-<(android_host_arch)/bin',

}],

['target_arch == "arm64"', {

'android_app_abi%': 'arm64-v8a',

'android_gdbserver%': '<(android_ndk_experimental_root)/prebuilt/android-arm64/gdbserver/gdbserver',

'android_ndk_sysroot%': '<(android_ndk_experimental_root)/platforms/android-20/arch-arm64',

+ 'android_ndk_lib_dir': '/usr/lib',

'android_toolchain%': '<(android_ndk_experimental_root)/toolchains/aarch64-linux-android-4.9/prebuilt/<(host_os)-<(android_host_arch)/bin',

'android_stlport_root': '<(android_ndk_experimental_root)/sources/cxx-stl/stlport',

}],

@@ -1553,6 +1557,7 @@

'android_app_abi%': 'mips',

'android_gdbserver%': '<(android_ndk_root)/prebuilt/android-mips/gdbserver/gdbserver',

'android_ndk_sysroot%': '<(android_ndk_root)/platforms/android-14/arch-mips',

+ 'android_ndk_lib_dir': '/usr/lib',

'android_toolchain%': '<(android_ndk_root)/toolchains/mipsel-linux-android-4.6/prebuilt/<(host_os)-<(android_host_arch)/bin',

}],

@@ -1567,7 +1572,7 @@

'android_toolchain%': '<(android_toolchain)',

'android_ndk_include': '<(android_ndk_sysroot)/usr/include',

- 'android_ndk_lib': '<(android_ndk_sysroot)/usr/lib',

+ 'android_ndk_lib': '<(android_ndk_sysroot)<(android_ndk_lib_dir)',

rmcilroy 2014/04/28 11:55:13 nit - I would prefer the "/" is here (rather than

'android_sdk_tools%': '<(android_sdk_tools)',

'android_sdk%': '<(android_sdk)',

'android_sdk_jar%': '<(android_sdk)/android.jar',

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