Index: build/common.gypi |
diff --git a/build/common.gypi b/build/common.gypi |
index e94ed2c8bdd7b9051dd05172a1c897765b699e28..a7699efe4ec4aa568fa198f6bd91cce3ebe733a5 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)', |
'android_sdk_tools%': '<(android_sdk_tools)', |
'android_sdk%': '<(android_sdk)', |
'android_sdk_jar%': '<(android_sdk)/android.jar', |