diff options
author | kerz@chromium.org <kerz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-27 22:23:21 +0000 |
---|---|---|
committer | kerz@chromium.org <kerz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-27 22:23:21 +0000 |
commit | d636884c3090d71874417d17eb78c4d6d7fba1e6 (patch) | |
tree | 063a261fe738ab004ae2168d0d3dffb9d9f6f460 /build | |
parent | 0ac0df21602c89d7a0b2997046c3f5997a622a34 (diff) | |
download | chromium_src-d636884c3090d71874417d17eb78c4d6d7fba1e6.zip chromium_src-d636884c3090d71874417d17eb78c4d6d7fba1e6.tar.gz chromium_src-d636884c3090d71874417d17eb78c4d6d7fba1e6.tar.bz2 |
Move experimental NDK to L
git-svn-id: svn://svn.chromium.org/chrome/branches/2062/src@280431 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
-rw-r--r-- | build/common.gypi | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/build/common.gypi b/build/common.gypi index 166130c..20c57629 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -1642,9 +1642,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"', { @@ -1663,7 +1663,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', |