Android: Make all targets depend on specific play services targets

Deletes google_play_services_library GN variable. This should reduce
compile times a bit, but mostly is just a good idea in general.

Change-Id: Ia991772db4a8549490926ad46808ceefaf12853f
Reviewed-on: https://chromium-review.googlesource.com/585450
Commit-Queue: Andrew Grieve <agrieve@chromium.org>
Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Reviewed-by: Lambros Lambrou <lambroslambrou@chromium.org>
Reviewed-by: Paul Miller <paulmiller@chromium.org>
Reviewed-by: Maria Khomenko <mariakhomenko@chromium.org>
Reviewed-by: Tommy Nyquist <nyquist@chromium.org>
Reviewed-by: Michael Case <mikecase@chromium.org>
Reviewed-by: Jochen Eisinger <jochen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#490968}

build/config/android/config.gni

@@ -69,18 +69,6 @@ if (is_android) {
     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)) {

chrome/android/BUILD.gn

@@ -181,6 +181,14 @@ android_library("chrome_java") {
     ":chrome_public_apk_template_resources",
     ":document_tab_model_info_proto_java",
     ":partner_location_descriptor_proto_java",
+    "$google_play_services_package:google_play_services_auth_base_java",
+    "$google_play_services_package:google_play_services_base_java",
+    "$google_play_services_package:google_play_services_basement_java",
+    "$google_play_services_package:google_play_services_cast_java",
+    "$google_play_services_package:google_play_services_gcm_java",
+    "$google_play_services_package:google_play_services_iid_java",
+    "$google_play_services_package:google_play_services_nearby_java",
+    "$google_play_services_package:google_play_services_tasks_java",
     "//base:base_java",
     "//chrome/android/webapk/libs/client:client_java",
     "//chrome/android/webapk/libs/common:common_java",
@@ -253,7 +261,6 @@ android_library("chrome_java") {
     "//ui/base/mojo:mojo_bindings_java",
     "//ui/gfx/geometry/mojo:mojo_java",
     "//url/mojo:url_mojom_gurl_java",
-    google_play_services_library,
   ]
 
   srcjar_deps = [
@@ -373,6 +380,9 @@ junit_binary("chrome_junit_tests") {
     ":chrome_java",
     ":chrome_java_resources",
     ":partner_location_descriptor_proto_java",
+    "$google_play_services_package:google_play_services_base_java",
+    "$google_play_services_package:google_play_services_basement_java",
+    "$google_play_services_package:google_play_services_cast_java",
     "//base:base_java",
     "//base:base_java_test_support",
     "//chrome/android/webapk/libs/client:client_java",
@@ -410,7 +420,6 @@ junit_binary("chrome_junit_tests") {
     "//third_party/hamcrest:hamcrest_java",
     "//ui/android:ui_java",
     "//url/mojo:url_mojom_gurl_java",
-    google_play_services_library,
   ]
   srcjar_deps = [ "//base:base_build_config_gen" ]
 
@@ -451,6 +460,12 @@ android_library("chrome_test_java") {
 
   deps = [
     ":partner_location_descriptor_proto_java",
+    "$google_play_services_package:google_play_services_base_java",
+    "$google_play_services_package:google_play_services_basement_java",
+    "$google_play_services_package:google_play_services_cast_java",
+    "$google_play_services_package:google_play_services_gcm_java",
+    "$google_play_services_package:google_play_services_iid_java",
+    "$google_play_services_package:google_play_services_tasks_java",
     "//base:base_java",
     "//base:base_java_test_support",
     "//chrome/android:app_hooks_java",
@@ -519,7 +534,6 @@ android_library("chrome_test_java") {
     "//ui/android:ui_java",
     "//ui/base/mojo:mojo_bindings_java",
     "//url/mojo:url_mojom_gurl_java",
-    google_play_services_library,
   ]
 
   data = [

chrome/test/android/BUILD.gn

@@ -69,6 +69,8 @@ android_library("chrome_java_test_support") {
     "javatests/src/org/chromium/chrome/test/util/TranslateUtil.java",
   ]
   deps = [
+    "$google_play_services_package:google_play_services_base_java",
+    "$google_play_services_package:google_play_services_basement_java",
     "//base:base_java",
     "//base:base_java_test_support",
     "//chrome/android:chrome_java",
@@ -96,6 +98,5 @@ android_library("chrome_java_test_support") {
     "//third_party/jsr-305:jsr_305_javalib",
     "//third_party/junit",
     "//ui/android:ui_java",
-    google_play_services_library,
   ]
 }

chrome/test/android/cast_emulator/BUILD.gn

@@ -20,9 +20,9 @@ android_library("cast_emulator") {
     "src/org/chromium/chrome/browser/media/router/DummyRoutePublisher.java",
   ]
   deps = [
+    "$google_play_services_package:google_play_services_cast_java",
     "//base:base_java",
     "//third_party/android_tools:android_support_v7_appcompat_java",
     "//third_party/android_tools:android_support_v7_mediarouter_java",
-    google_play_services_library,
   ]
 }

components/background_task_scheduler/BUILD.gn

@@ -39,9 +39,12 @@ if (is_android) {
     ]
 
     deps = [
+      "$google_play_services_package:google_play_services_base_java",
+      "$google_play_services_package:google_play_services_basement_java",
+      "$google_play_services_package:google_play_services_gcm_java",
+      "$google_play_services_package:google_play_services_tasks_java",
       "//base:base_java",
       "//third_party/android_tools:android_support_annotations_java",
-      google_play_services_library,
     ]
   }
 
@@ -55,11 +58,14 @@ if (is_android) {
 
     deps = [
       ":background_task_scheduler_java",
+      "$google_play_services_package:google_play_services_base_java",
+      "$google_play_services_package:google_play_services_basement_java",
+      "$google_play_services_package:google_play_services_gcm_java",
+      "$google_play_services_package:google_play_services_tasks_java",
       "//base:base_java",
       "//base:base_java_test_support",
       "//third_party/android_support_test_runner:runner_java",
       "//third_party/junit",
-      google_play_services_library,
     ]
   }
 
@@ -76,10 +82,14 @@ if (is_android) {
 
     deps = [
       ":background_task_scheduler_java",
+      "$google_play_services_package:google_play_services_auth_base_java",
+      "$google_play_services_package:google_play_services_base_java",
+      "$google_play_services_package:google_play_services_basement_java",
+      "$google_play_services_package:google_play_services_gcm_java",
+      "$google_play_services_package:google_play_services_tasks_java",
       "//base:base_java",
       "//base:base_java_test_support",
       "//third_party/junit",
-      google_play_services_library,
     ]
     srcjar_deps = [ "//base:base_build_config_gen" ]
   }

components/gcm_driver/instance_id/android/BUILD.gn

@@ -20,8 +20,8 @@ generate_jni("test_support_jni_headers") {
 
 android_library("instance_id_driver_java") {
   deps = [
+    "$google_play_services_package:google_play_services_iid_java",
     "//base:base_java",
-    google_play_services_library,
   ]
 
   java_files = [
@@ -33,8 +33,8 @@ android_library("instance_id_driver_java") {
 android_library("instance_id_driver_test_support_java") {
   deps = [
     ":instance_id_driver_java",
+    "$google_play_services_package:google_play_services_iid_java",
     "//base:base_java",
-    google_play_services_library,
   ]
 
   java_files = [ "javatests/src/org/chromium/components/gcm_driver/instance_id/FakeInstanceIDWithSubtype.java" ]

components/signin/core/browser/android/BUILD.gn

@@ -13,10 +13,12 @@ generate_jni("jni_headers") {
 
 android_library("java") {
   deps = [
+    "$google_play_services_package:google_play_services_auth_base_java",
+    "$google_play_services_package:google_play_services_base_java",
+    "$google_play_services_package:google_play_services_basement_java",
     "//base:base_java",
     "//net/android:net_java",
     "//third_party/android_tools:android_support_annotations_java",
-    google_play_services_library,
   ]
 
   java_files = [

components/sync/android/BUILD.gn

@@ -15,7 +15,6 @@ android_library("sync_java") {
     "//third_party/cacheinvalidation:cacheinvalidation_javalib",
     "//third_party/cacheinvalidation:cacheinvalidation_proto_java",
     "//third_party/jsr-305:jsr_305_javalib",
-    google_play_services_library,
   ]
   srcjar_deps = [ ":java_enums" ]
   java_files = [

remoting/android/BUILD.gn

@@ -59,7 +59,7 @@ android_resources("remoting_android_client_java_resources") {
 }
 
 remoting_android_client_java_tmpl("remoting_android_client_java") {
-  remoting_google_play_services_library = google_play_services_library
+  play_services_package = "//third_party/android_tools"
 }
 
 remoting_apk_tmpl("remoting_apk") {

remoting/android/client_java_tmpl.gni

@@ -88,9 +88,20 @@ template("remoting_android_client_java_tmpl") {
       "//ui/android:ui_utils_java",
     ]
 
+    if (defined(invoker.play_services_package)) {
+      deps += [
+        "${invoker.play_services_package}:google_play_services_auth_base_java",
+        "${invoker.play_services_package}:google_play_services_base_java",
+        "${invoker.play_services_package}:google_play_services_basement_java",
+      ]
+    }
+
+    # TODO(agrieve): Convert downstream to use play_services_package.
+    if (defined(invoker.remoting_google_play_services_library)) {
+      deps += [ invoker.remoting_google_play_services_library ]
+    }
+
     # Manifest used for linting (determining unused resources).
     android_manifest = "$root_gen_dir/remoting/android/AndroidManifest.xml"
-
-    deps += [ invoker.remoting_google_play_services_library ]
   }
 }

third_party/cacheinvalidation/BUILD.gn

@@ -136,9 +136,11 @@ if (is_android) {
     emma_never_instrument = true
     deps = [
       ":cacheinvalidation_proto_java",
+      "$google_play_services_package:google_play_services_gcm_java",
+      "$google_play_services_package:google_play_services_iid_java",
+      "$google_play_services_package:google_play_services_tasks_java",
       "//third_party/android_protobuf:protobuf_nano_javalib",
       "//third_party/android_tools:android_gcm_java",
-      google_play_services_library,
     ]
 
     java_files = [

third_party/robolectric/BUILD.gn

@@ -692,9 +692,11 @@ java_library("shadows_play_services_java") {
     ":robolectric_processor_java",
     ":robolectric_resources_java",
     ":robolectric_utils_java",
+    "$google_play_services_package:google_play_services_auth_base_java",
+    "$google_play_services_package:google_play_services_base_java",
+    "$google_play_services_package:google_play_services_basement_java",
     "//third_party/android_tools:android_support_v4_java",
     "//third_party/guava:guava_java",
-    google_play_services_library,
   ]
 
   # Work-around for gradle generator not yet supporting annotation processors.