▶ 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 ac754d2ec115bb71f51140592f03a6a4dd5ec7a0..da53cea792e21bec65456e6cc99dc07c528cb8b7 100644
--- a/build/secondary/third_party/android_tools/BUILD.gn
+++ b/build/secondary/third_party/android_tools/BUILD.gn
@@ -110,23 +110,21 @@ android_aar_prebuilt("android_support_v7_recyclerview_java") {
   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"
+java_group("google_play_services_default_resources") {

[dgn, 2016/08/05 16:12:07]

This is a noop target because targets out of the main repo have it as a
dependency and I don't want to break them now.
I probably can't remove it until downstream also removes the equivalent target
anyway.

+  deps = []
 }
 
-android_java_prebuilt("google_play_services_default_java") {
+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_basement_java",
+    ":google_play_services_base_java",
+    ":google_play_services_auth_java",
+    ":google_play_services_auth_base_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" ]

[agrieve, 2016/08/05 18:59:28]

I think this is the line needed to fix the bots. However, I don't think it's
currently a property that you can attach to a library and have it get passed
along to the apk target. I really needs to be though. I'll try and work on a
patch for this today.

[dgn, 2016/08/08 17:17:24]

Thanks! Release builds work locally with your patch.

-  proguard_preprocess = true
-  proguard_config = "//third_party/android_tools/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") {
@@ -142,3 +140,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.4.0"
+
+android_aar_prebuilt("google_play_services_basement_java") {
+  deps = [
+    ":android_support_v4_java",
+  ]
+  lib_name = "play-services-basement"

[agrieve, 2016/08/05 18:59:28]

nit: lib_name -> _lib_name

[dgn, 2016/08/08 17:17:24]

Done.

+  aar_path = "$gms_path/$lib_name/$gms_version/$lib_name-$gms_version.aar"
+}
+
+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"
+}
+
+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"
+}
+
+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"
+}
+
+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"
+}
+
+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"
+}
+
+# android_aar_prebuilt("google_play_services_cast_framework_java") {

[agrieve, 2016/08/05 18:59:28]

Remove?

[dgn, 2016/08/08 17:17:24]

Done.

+#   deps = [
+#     ":google_play_services_base_java",
+#     ":google_play_services_basement_java",
+#     ":google_play_services_cast_java",
+#   ]
+#   lib_name = "play-services-cast-framework"
+#   aar_path = "$gms_path/$lib_name/$gms_version/$lib_name-$gms_version.aar"
+# }
+
+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"
+}
+
+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"
+}
+
+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"
+}