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

Unified Diff: build/config/android/config.gni

Issue 2297273002: Reorder default_android_ndk_major_version declarations. (Closed)
Patch Set: Created 4 years, 4 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 | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/config/android/config.gni
diff --git a/build/config/android/config.gni b/build/config/android/config.gni
index b658069a34895f6c3b316f17c5c268c0cb44fa29..a9df598daef588b0265fbe58358f21889d10a658 100644
--- a/build/config/android/config.gni
+++ b/build/config/android/config.gni
@@ -25,11 +25,12 @@ if (is_android) {
}
if (!defined(default_android_ndk_root)) {
- default_android_ndk_major_version = "10"
default_android_ndk_root = "//third_party/android_tools/ndk"
default_android_ndk_version = "r10e"
+ default_android_ndk_major_version = "10"
} else {
assert(defined(default_android_ndk_version))
+ assert(defined(default_android_ndk_major_version))
}
# The same version of lint should be used for building all targets,
@@ -70,9 +71,9 @@ if (is_android) {
}
declare_args() {
- android_ndk_major_version = default_android_ndk_major_version
android_ndk_root = default_android_ndk_root
android_ndk_version = default_android_ndk_version
+ android_ndk_major_version = default_android_ndk_major_version
android_sdk_root = default_android_sdk_root
android_sdk_version = default_android_sdk_version
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698