Define separate variable for the sdk root used to load gmscore.

BUG=624324
TBR=agrieve@chromium.org

Review-Url: https://codereview.chromium.org/2458083002
Cr-Commit-Position: refs/heads/master@{#428398}

This commit is contained in:

dgn

2016-10-28 10:06:00 -07:00

committed by

Commit bot

parent d624e939a8

commit 0ea787ad5d

2 changed files with 8 additions and 1 deletions

build

config

android

secondary

third_party

android_tools

 @ -46,6 +46,13 @@ if (is_android) {
     default_lint_android_sdk_version = "23"
   }
   if (!defined(default_extras_android_sdk_root)) {
     # Purposefully repeated so that downstream can change
     # default_android_sdk_root without changing where we load the SDK extras
     # from. (Google Play services, etc.)
     default_extras_android_sdk_root = "//third_party/android_tools/sdk"
   }
   if (!defined(default_android_keystore_path)) {
     default_android_keystore_path =
         "//build/android/ant/chromium-debug.keystore"

 @ -144,7 +144,7 @@ android_java_prebuilt("legacy_http_javalib") {
 }
 # TODO(dgn): Use the POM files instead of hardcoding the dependencies.
 gms_path = "$android_sdk_root/extras/google/m2repository/com/google/android/gms"
 gms_path = "$default_extras_android_sdk_root/extras/google/m2repository/com/google/android/gms"
 gms_version = "9.8.0"
 android_aar_prebuilt("google_play_services_basement_java") {