▶ Update the Play services to 9.8 and load from AARs

build/secondary/third_party/android_tools/BUILD.gn

Index: build/secondary/third_party/android_tools/BUILD.gn
diff --git a/build/secondary/third_party/android_tools/BUILD.gn b/build/secondary/third_party/android_tools/BUILD.gn
index cbf3da94667c50bc1944e3f74cbb1f4a085f861e..a31f4cf37376b94a52e1335bb70666e56ced22ce 100644
--- a/build/secondary/third_party/android_tools/BUILD.gn
+++ b/build/secondary/third_party/android_tools/BUILD.gn
@@ -45,8 +45,8 @@ android_aar_prebuilt("android_support_design_java") {
   deps = [
     ":android_support_v7_appcompat_java",
   ]
-  lib_name = "design"
-  aar_path = "$lib_path/$lib_name/$lib_version/$lib_name-$lib_version.aar"
+  _lib_name = "design"
+  aar_path = "$lib_path/$_lib_name/$lib_version/$_lib_name-$lib_version.aar"
 }
 
 android_aar_prebuilt("android_support_multidex_java") {
@@ -56,13 +56,13 @@ android_aar_prebuilt("android_support_multidex_java") {
 }
 
 android_java_prebuilt("android_support_annotations_java") {
-  lib_name = "support-annotations"
-  jar_path = "$lib_path/$lib_name/$lib_version/$lib_name-$lib_version.jar"
+  _lib_name = "support-annotations"
+  jar_path = "$lib_path/$_lib_name/$lib_version/$_lib_name-$lib_version.jar"
 }
 
 android_aar_prebuilt("android_support_v4_java") {
-  lib_name = "support-v4"
-  aar_path = "$lib_path/$lib_name/$lib_version/$lib_name-$lib_version.aar"
+  _lib_name = "support-v4"
+  aar_path = "$lib_path/$_lib_name/$lib_version/$_lib_name-$lib_version.aar"
   ignore_aidl = true  # We don't appear to need these currently.
 }
 
@@ -71,18 +71,18 @@ android_aar_prebuilt("android_support_v13_java") {
     ":android_support_annotations_java",
     ":android_support_v4_java",
   ]
-  lib_name = "support-v13"
-  aar_path = "$lib_path/$lib_name/$lib_version/$lib_name-$lib_version.aar"
+  _lib_name = "support-v13"
+  aar_path = "$lib_path/$_lib_name/$lib_version/$_lib_name-$lib_version.aar"
 }
 
 android_aar_prebuilt("android_support_vector_drawable_java") {
-  lib_name = "support-vector-drawable"
-  aar_path = "$lib_path/$lib_name/$lib_version/$lib_name-$lib_version.aar"
+  _lib_name = "support-vector-drawable"
+  aar_path = "$lib_path/$_lib_name/$lib_version/$_lib_name-$lib_version.aar"
 }
 
 android_aar_prebuilt("android_support_v7_appcompat_java_internal") {
-  lib_name = "appcompat-v7"
-  aar_path = "$lib_path/$lib_name/$lib_version/$lib_name-$lib_version.aar"
+  _lib_name = "appcompat-v7"
+  aar_path = "$lib_path/$_lib_name/$lib_version/$_lib_name-$lib_version.aar"
 }
 
 java_group("android_support_v7_appcompat_java") {
@@ -97,45 +97,44 @@ android_aar_prebuilt("android_support_v7_mediarouter_java") {
   deps = [
     ":android_support_v7_appcompat_java",
   ]
-  lib_name = "mediarouter-v7"
-  aar_path = "$lib_path/$lib_name/$lib_version/$lib_name-$lib_version.aar"
+  _lib_name = "mediarouter-v7"
+  aar_path = "$lib_path/$_lib_name/$lib_version/$_lib_name-$lib_version.aar"
 }
 
 android_aar_prebuilt("android_support_v7_recyclerview_java") {
   deps = [
     ":android_support_v7_appcompat_java",
   ]
-  lib_name = "recyclerview-v7"
-  aar_path = "$lib_path/$lib_name/$lib_version/$lib_name-$lib_version.aar"
+  _lib_name = "recyclerview-v7"
+  aar_path = "$lib_path/$_lib_name/$lib_version/$_lib_name-$lib_version.aar"
 }
 
-android_resources("google_play_services_default_resources") {
-  v14_skip = true
-  resource_dirs = [ "$android_sdk_root/extras/google/google_play_services/libproject/google-play-services_lib/res" ]
-  custom_package = "com.google.android.gms"
+# TODO(dgn): Remove this once no other target has a dependency on it
+java_group("google_play_services_default_resources") {
+  deps = []
 }
 
-android_java_prebuilt("google_play_services_default_java") {
+# TODO(dgn): Remove this once other targets register dependencies on only the
+# modules they need.
+java_group("google_play_services_default_java") {
   deps = [
-    ":android_support_annotations_java",
-    ":android_support_v4_java",
-    ":android_support_v7_mediarouter_java",
-    ":google_play_services_default_resources",
+    ":google_play_services_auth_base_java",
+    ":google_play_services_auth_java",
+    ":google_play_services_base_java",
+    ":google_play_services_basement_java",
+    ":google_play_services_cast_java",
+    ":google_play_services_gcm_java",
+    ":google_play_services_iid_java",
+    ":google_play_services_nearby_java",
   ]
-  input_jars_paths = [ "$android_sdk/optional/org.apache.http.legacy.jar" ]
-  proguard_preprocess = true
-  proguard_preprocess_config = "//third_party/android_tools/proguard.flags"
-  proguard_configs =
-      [ "//build/secondary/third_party/android_tools/apk_proguard.flags" ]
-  jar_path = "$android_sdk_root/extras/google/google_play_services/libproject/google-play-services_lib/libs/google-play-services.jar"
 }
 
 android_aar_prebuilt("android_support_v17_leanback_java") {
   deps = [
     ":android_support_v7_recyclerview_java",
   ]
-  lib_name = "leanback-v17"
-  aar_path = "$lib_path/$lib_name/$lib_version/$lib_name-$lib_version.aar"
+  _lib_name = "leanback-v17"
+  aar_path = "$lib_path/$_lib_name/$lib_version/$_lib_name-$lib_version.aar"
 }
 
 # TODO(jbudorick): Remove this once net_java_test_support no longer needs it.
@@ -143,3 +142,99 @@ android_java_prebuilt("legacy_http_javalib") {
   testonly = true
   jar_path = "$android_sdk/optional/org.apache.http.legacy.jar"
 }
+
+# TODO(dgn): Use the POM files instead of hardcoding the dependencies.
+gms_path = "$android_sdk_root/extras/google/m2repository/com/google/android/gms"
+gms_version = "9.8.0"
+
+android_aar_prebuilt("google_play_services_basement_java") {
+  deps = [
+    ":android_support_v4_java",
+  ]
+  _lib_name = "play-services-basement"
+  aar_path = "$gms_path/$_lib_name/$gms_version/$_lib_name-$gms_version.aar"
+  input_jars_paths = [ "$android_sdk/optional/org.apache.http.legacy.jar" ]
+  ignore_manifest = true
+}
+
+android_aar_prebuilt("google_play_services_tasks_java") {
+  deps = [
+    ":google_play_services_basement_java",
+  ]
+  _lib_name = "play-services-tasks"
+  aar_path = "$gms_path/$_lib_name/$gms_version/$_lib_name-$gms_version.aar"
+  ignore_manifest = true
+}
+
+android_aar_prebuilt("google_play_services_base_java") {
+  deps = [
+    ":google_play_services_basement_java",
+    ":google_play_services_tasks_java",
+  ]
+  _lib_name = "play-services-base"
+  aar_path = "$gms_path/$_lib_name/$gms_version/$_lib_name-$gms_version.aar"
+  ignore_manifest = true
+}
+
+android_aar_prebuilt("google_play_services_auth_base_java") {
+  deps = [
+    ":google_play_services_base_java",
+    ":google_play_services_basement_java",
+  ]
+  _lib_name = "play-services-auth-base"
+  aar_path = "$gms_path/$_lib_name/$gms_version/$_lib_name-$gms_version.aar"
+  ignore_manifest = true
+}
+
+android_aar_prebuilt("google_play_services_auth_java") {
+  deps = [
+    ":google_play_services_auth_base_java",
+    ":google_play_services_base_java",
+    ":google_play_services_basement_java",
+  ]
+  _lib_name = "play-services-auth"
+  aar_path = "$gms_path/$_lib_name/$gms_version/$_lib_name-$gms_version.aar"
+  ignore_manifest = true
+}
+
+android_aar_prebuilt("google_play_services_cast_java") {
+  deps = [
+    ":android_support_v7_mediarouter_java",
+    ":google_play_services_base_java",
+    ":google_play_services_basement_java",
+  ]
+  _lib_name = "play-services-cast"
+  aar_path = "$gms_path/$_lib_name/$gms_version/$_lib_name-$gms_version.aar"
+  ignore_manifest = true
+}
+
+android_aar_prebuilt("google_play_services_iid_java") {
+  deps = [
+    ":google_play_services_base_java",
+    ":google_play_services_basement_java",
+  ]
+  _lib_name = "play-services-iid"
+  aar_path = "$gms_path/$_lib_name/$gms_version/$_lib_name-$gms_version.aar"
+  ignore_manifest = true
+}
+
+android_aar_prebuilt("google_play_services_gcm_java") {
+  deps = [
+    ":google_play_services_base_java",
+    ":google_play_services_basement_java",
+    ":google_play_services_iid_java",
+  ]
+  _lib_name = "play-services-gcm"
+  aar_path = "$gms_path/$_lib_name/$gms_version/$_lib_name-$gms_version.aar"
+  ignore_manifest = true
+}
+
+android_aar_prebuilt("google_play_services_nearby_java") {
+  deps = [
+    ":google_play_services_base_java",
+    ":google_play_services_basement_java",
+  ]
+  _lib_name = "play-services-nearby"
+  aar_path = "$gms_path/$_lib_name/$gms_version/$_lib_name-$gms_version.aar"
+  ignore_manifest = true
+}