WebView: prepare to depend on individual GMS services

build/config/android/config.gni

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # This file contains common system config stuff for the Android build.
 
 if (is_android) {
   import("//build_overrides/build.gni")
 
   has_chrome_android_internal =
@@ skipping 38 matching lines @@
     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"
     default_android_keystore_name = "chromiumdebugkey"
     default_android_keystore_password = "chromium"
   }
 
+  # TODO(paulmiller): Remove; superseded by google_play_services_package.
   if (!defined(google_play_services_library)) {
     google_play_services_library =
         "//third_party/android_tools:google_play_services_default_java"
   }
 
+  # TODO(paulmiller): Remove; superseded by google_play_services_package.
   if (!defined(google_play_services_resources)) {
     google_play_services_resources =
         "//third_party/android_tools:google_play_services_default_resources"
   }
 
+  # google_play_services_package contains the path where individual client
+  # targets (e.g. google_play_services_base_java) are located.
+  if (!defined(google_play_services_package)) {
+    google_play_services_package = "//third_party/android_tools"
+  }
+
   webview_public_framework_jar =
       "//third_party/android_platform/webview/frameworks_7.0.0_r1.jar"
   if (!defined(webview_framework_jar)) {
     webview_framework_jar = webview_public_framework_jar
   }
 
   declare_args() {
     android_ndk_root = default_android_ndk_root
     android_ndk_version = default_android_ndk_version
     android_ndk_major_version = default_android_ndk_major_version
@@ skipping 266 matching lines @@
           "//build/toolchain/android:android_${android_secondary_abi_cpu}"
     }
   }
 }
 
 declare_args() {
   # Enables used resource whitelist generation. Set for official builds only
   # as a large amount of build output is generated.
   enable_resource_whitelist_generation = is_android && is_official_build
 }