Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(429)

Unified Diff: DEPS

Issue 2193943002: [Android] Roll to NDK r12b. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: No more -lc++ & update host gdb client path. Created 4 years, 3 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
« no previous file with comments | « no previous file | build/android/adb_gdb » ('j') | build/config/android/BUILD.gn » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: DEPS
diff --git a/DEPS b/DEPS
index 686ac5909f76ba2a7c0ac157213212369d8331c6..612cc232fcaf5c9b66da21632bef192582418323 100644
--- a/DEPS
+++ b/DEPS
@@ -429,7 +429,7 @@ deps_os = {
Var('chromium_git') + '/external/android_protobuf.git' + '@' + '999188d0dc72e97f7fe08bb756958a2cf090f4e7',
'src/third_party/android_tools':
- Var('chromium_git') + '/android_tools.git' + '@' + 'af1c5a4cd6329ccdcf8c2bc93d9eea02f9d74869',
+ Var('chromium_git') + '/android_tools.git' + '@' + '25d57ead05d3dfef26e9c19b13ed10b0a69829cf',
'src/third_party/apache-mime4j':
Var('chromium_git') + '/chromium/deps/apache-mime4j.git' + '@' + '28cb1108bff4b6cf0a2e86ff58b3d025934ebe3a',
@@ -493,8 +493,6 @@ deps_os = {
},
}
-recursedeps = [ 'src/third_party/android_tools' ]
-
include_rules = [
# Everybody can use some things.
# NOTE: THIS HAS TO STAY IN SYNC WITH third_party/DEPS which disallows these.
@@ -1025,5 +1023,9 @@ hooks = [
},
]
-# ANGLE manages DEPS that it also owns the build files for, such as dEQP.
-recursedeps = [("src/third_party/angle", "DEPS.chromium")]
+recursedeps = [
+ # android_tools manages the NDK.
+ 'src/third_party/android_tools',
+ # ANGLE manages DEPS that it also owns the build files for, such as dEQP.
+ ("src/third_party/angle", "DEPS.chromium"),
+]
« no previous file with comments | « no previous file | build/android/adb_gdb » ('j') | build/config/android/BUILD.gn » ('J')

Powered by Google App Engine
This is Rietveld 408576698