From 353a7fcfe5b310e5192e78073474e3943ec1d5d9 Mon Sep 17 00:00:00 2001 From: agrieve Date: Wed, 12 Oct 2016 13:59:40 -0700 Subject: [PATCH] Don't base android lint version off of android sdk version. If downstream overrides sdk version, we don't want the lint version to change. BUG=623989 Review-Url: https://codereview.chromium.org/2418433003 Cr-Original-Commit-Position: refs/heads/master@{#424847} Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src Cr-Mirrored-Commit: 11837e363c671aa15024b9d1228057fc2bacd6eb --- config/android/config.gni | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/config/android/config.gni b/config/android/config.gni index 191719e4b..1978fa24d 100644 --- a/config/android/config.gni +++ b/config/android/config.gni @@ -40,8 +40,10 @@ if (is_android) { } if (!defined(default_lint_android_sdk_root)) { - default_lint_android_sdk_root = default_android_sdk_root - default_lint_android_sdk_version = default_android_sdk_version + # Purposefully repeated so that downstream can change + # default_android_sdk_root without changing lint version. + default_lint_android_sdk_root = "//third_party/android_tools/sdk" + default_lint_android_sdk_version = "23" } if (!defined(default_android_keystore_path)) {