Commit e435da04 authored by jbudorick's avatar jbudorick Committed by Commit bot

[Android] Revert the NDK back to r10e.

BUG=599327

Review-Url: https://codereview.chromium.org/2040043002
Cr-Commit-Position: refs/heads/master@{#398138}
parent 55ff9438
...@@ -114,7 +114,7 @@ allowed_hosts = [ ...@@ -114,7 +114,7 @@ allowed_hosts = [
deps = { deps = {
'src/breakpad/src': 'src/breakpad/src':
Var('chromium_git') + '/breakpad/breakpad/src.git' + '@' + 'a9d0511e9d7cf85221adcf9b43e80dc19eba04cc', Var('chromium_git') + '/breakpad/breakpad/src.git' + '@' + '1c3361fcc256bfa0e6b3e3ce8cb99e070a49c46b',
'src/buildtools': 'src/buildtools':
Var('chromium_git') + '/chromium/buildtools.git' + '@' + Var('buildtools_revision'), Var('chromium_git') + '/chromium/buildtools.git' + '@' + Var('buildtools_revision'),
...@@ -435,7 +435,7 @@ deps_os = { ...@@ -435,7 +435,7 @@ deps_os = {
Var('chromium_git') + '/external/android_protobuf.git' + '@' + '999188d0dc72e97f7fe08bb756958a2cf090f4e7', Var('chromium_git') + '/external/android_protobuf.git' + '@' + '999188d0dc72e97f7fe08bb756958a2cf090f4e7',
'src/third_party/android_tools': 'src/third_party/android_tools':
Var('chromium_git') + '/android_tools.git' + '@' + '04c2c06fe3ef3d93343feb6e83cd932725740d7f', Var('chromium_git') + '/android_tools.git' + '@' + '5b5f2f60b78198eaef25d442ac60f823142a8a6e',
'src/third_party/apache-mime4j': 'src/third_party/apache-mime4j':
Var('chromium_git') + '/chromium/deps/apache-mime4j.git' + '@' + '28cb1108bff4b6cf0a2e86ff58b3d025934ebe3a', Var('chromium_git') + '/chromium/deps/apache-mime4j.git' + '@' + '28cb1108bff4b6cf0a2e86ff58b3d025934ebe3a',
......
...@@ -1716,7 +1716,7 @@ ...@@ -1716,7 +1716,7 @@
'android_ndk_absolute_root%': '<!(cd <(DEPTH) && pwd -P)/third_party/android_tools/ndk/', 'android_ndk_absolute_root%': '<!(cd <(DEPTH) && pwd -P)/third_party/android_tools/ndk/',
'android_host_arch%': '<!(uname -m)', 'android_host_arch%': '<!(uname -m)',
# Version of the NDK. Used to ensure full rebuilds on NDK rolls. # Version of the NDK. Used to ensure full rebuilds on NDK rolls.
'android_ndk_version%': 'r11c', 'android_ndk_version%': 'r10e',
# Android API-level of the SDK used for compilation. # Android API-level of the SDK used for compilation.
'android_sdk_version%': '23', 'android_sdk_version%': '23',
'android_sdk_build_tools_version%': '23.0.1', 'android_sdk_build_tools_version%': '23.0.1',
......
...@@ -23,7 +23,7 @@ if (is_android) { ...@@ -23,7 +23,7 @@ if (is_android) {
if (!defined(default_android_ndk_root)) { if (!defined(default_android_ndk_root)) {
default_android_ndk_root = "//third_party/android_tools/ndk" default_android_ndk_root = "//third_party/android_tools/ndk"
default_android_ndk_version = "r11c" default_android_ndk_version = "r10e"
} }
if (!defined(default_android_sdk_root)) { if (!defined(default_android_sdk_root)) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment