| Index: build/common.gypi
|
| diff --git a/build/common.gypi b/build/common.gypi
|
| index 29d8c1cb4c7ffa727fbcdd899fcea8838ab47423..d9558b9a6aca8984354013f99696885d72b12e08 100644
|
| --- a/build/common.gypi
|
| +++ b/build/common.gypi
|
| @@ -1648,9 +1648,9 @@
|
| ['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_sysroot%': '<(android_ndk_experimental_root)/platforms/android-L/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_toolchain%': '<(android_ndk_experimental_root)/toolchains/x86_64-4.9/prebuilt/<(host_os)-<(android_host_arch)/bin',
|
| 'android_stlport_root': '<(android_ndk_experimental_root)/sources/cxx-stl/stlport',
|
| }],
|
| ['target_arch=="arm"', {
|
| @@ -1669,7 +1669,7 @@
|
| ['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_sysroot%': '<(android_ndk_experimental_root)/platforms/android-L/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',
|
|
|