Roll GMS to 11.2.0 a.k.a. v12_1

- Add the vision-common client, since the vision client has been split into vision and vision-common. - Add a landmine, since GN can't deal with reversing the dependency between google_play_services_vision_common_java and google_play_services_vision_java. - Add the basement client's Proguard config to all the other clients, since common Proguard flags are now consolidated in basement, rather than being duplicated for all clients. - Update the cached .info files, as is required since cf7f522. - Make InstanceIdWithSubtype contain rather than extend InstanceID. The InstanceID constructor which takes a subtype is now private; iid instead exposes a getInstance which takes the subtype via Bundle. BUG=706943 Change-Id: I16ba37243eb7a5b49539fefe489986fcd3f8ffb0 Reviewed-on: https://chromium-review.googlesource.com/729047 Reviewed-by: John Budorick <jbudorick@chromium.org> Reviewed-by: Peter Beverloo <peter@chromium.org> Commit-Queue: Paul Miller <paulmiller@chromium.org> Cr-Commit-Position: refs/heads/master@{#510877}
marcosholgado · Oct 23, 2017 · 3a7fff5 · 3a7fff5
1 parent 027bc13
commit 3a7fff5
Show file tree

Hide file tree

Showing 20 changed files with 126 additions and 64 deletions.
diff --git a/build/android/play_services/LICENSE.sha1 b/build/android/play_services/LICENSE.sha1
@@ -1 +1 @@
-31843001b7ce94fbdf71f2a9db76b28548a795fa
+76a1dca20a2697eb9250eb08424503259b8b6aa7
diff --git a/build/android/play_services/config.json b/build/android/play_services/config.json
@@ -10,8 +10,9 @@
     "play-services-location",
     "play-services-nearby",
     "play-services-tasks",
-    "play-services-vision"
+    "play-services-vision",
+    "play-services-vision-common"
   ],
-  "version_number": "10.2.0",
+  "version_number": "11.2.0",
   "version_xml_path": "res/values/version.xml"
 }
diff --git a/build/android/play_services/google_play_services_library.zip.sha1 b/build/android/play_services/google_play_services_library.zip.sha1
@@ -1 +1 @@
-c0867d3d4daf1fad7d460bcfd27effdf15bbd450
+c812f827e8dd2cb28cb41003519f50d33fe64856
diff --git a/build/get_landmines.py b/build/get_landmines.py
@@ -45,6 +45,7 @@ def print_landmines():
     print 'Clobber: to handle new way of suppressing findbugs failures.'
     print 'Clobber to fix gyp not rename package name (crbug.com/457038)'
     print 'Clobber to recalculate reversed dependency (crbug.com/639042)'
+    print 'Clobber to recalculate reversed dependency (crbug.com/639042)'
   if platform() == 'win':
     print 'Compile on cc_unittests fails due to symbols removed in r185063.'
   if platform() == 'linux':

diff --git a/build/secondary/third_party/android_tools/BUILD.gn b/build/secondary/third_party/android_tools/BUILD.gn
@@ -95,7 +95,7 @@ support_lib_alias("android_support_vector_drawable_java") {
 
 # TODO(dgn): Use the POM files instead of hardcoding the dependencies.
 gms_path = "$default_extras_android_sdk_root/extras/google/m2repository/com/google/android/gms"
-gms_version = "10.2.0"
+gms_version = "11.2.0"
 
 android_aar_prebuilt("google_play_services_basement_java") {
   deps = [
@@ -114,6 +114,8 @@ android_aar_prebuilt("google_play_services_tasks_java") {
   _lib_name = "play-services-tasks"
   aar_path = "$gms_path/$_lib_name/$gms_version/$_lib_name-$gms_version.aar"
   info_path = "//build/secondary/third_party/android_tools/$target_name.info"
+  proguard_configs =
+      [ "${target_gen_dir}/google_play_services_basement_java/proguard.txt" ]
 }
 
 android_aar_prebuilt("google_play_services_base_java") {
@@ -125,6 +127,8 @@ android_aar_prebuilt("google_play_services_base_java") {
   _lib_name = "play-services-base"
   aar_path = "$gms_path/$_lib_name/$gms_version/$_lib_name-$gms_version.aar"
   info_path = "//build/secondary/third_party/android_tools/$target_name.info"
+  proguard_configs =
+      [ "${target_gen_dir}/google_play_services_basement_java/proguard.txt" ]
 }
 
 android_aar_prebuilt("google_play_services_auth_base_java") {
@@ -135,6 +139,8 @@ android_aar_prebuilt("google_play_services_auth_base_java") {
   _lib_name = "play-services-auth-base"
   aar_path = "$gms_path/$_lib_name/$gms_version/$_lib_name-$gms_version.aar"
   info_path = "//build/secondary/third_party/android_tools/$target_name.info"
+  proguard_configs =
+      [ "${target_gen_dir}/google_play_services_basement_java/proguard.txt" ]
 }
 
 android_aar_prebuilt("google_play_services_auth_java") {
@@ -146,6 +152,8 @@ android_aar_prebuilt("google_play_services_auth_java") {
   _lib_name = "play-services-auth"
   aar_path = "$gms_path/$_lib_name/$gms_version/$_lib_name-$gms_version.aar"
   info_path = "//build/secondary/third_party/android_tools/$target_name.info"
+  proguard_configs =
+      [ "${target_gen_dir}/google_play_services_basement_java/proguard.txt" ]
 }
 
 android_aar_prebuilt("google_play_services_cast_java") {
@@ -157,6 +165,8 @@ android_aar_prebuilt("google_play_services_cast_java") {
   _lib_name = "play-services-cast"
   aar_path = "$gms_path/$_lib_name/$gms_version/$_lib_name-$gms_version.aar"
   info_path = "//build/secondary/third_party/android_tools/$target_name.info"
+  proguard_configs =
+      [ "${target_gen_dir}/google_play_services_basement_java/proguard.txt" ]
 }
 
 android_aar_prebuilt("google_play_services_iid_java") {
@@ -167,6 +177,8 @@ android_aar_prebuilt("google_play_services_iid_java") {
   _lib_name = "play-services-iid"
   aar_path = "$gms_path/$_lib_name/$gms_version/$_lib_name-$gms_version.aar"
   info_path = "//build/secondary/third_party/android_tools/$target_name.info"
+  proguard_configs =
+      [ "${target_gen_dir}/google_play_services_basement_java/proguard.txt" ]
 }
 
 android_aar_prebuilt("google_play_services_gcm_java") {
@@ -178,6 +190,8 @@ android_aar_prebuilt("google_play_services_gcm_java") {
   _lib_name = "play-services-gcm"
   aar_path = "$gms_path/$_lib_name/$gms_version/$_lib_name-$gms_version.aar"
   info_path = "//build/secondary/third_party/android_tools/$target_name.info"
+  proguard_configs =
+      [ "${target_gen_dir}/google_play_services_basement_java/proguard.txt" ]
 }
 
 android_aar_prebuilt("google_play_services_location_java") {
@@ -188,6 +202,8 @@ android_aar_prebuilt("google_play_services_location_java") {
   _lib_name = "play-services-location"
   aar_path = "$gms_path/$_lib_name/$gms_version/$_lib_name-$gms_version.aar"
   info_path = "//build/secondary/third_party/android_tools/$target_name.info"
+  proguard_configs =
+      [ "${target_gen_dir}/google_play_services_basement_java/proguard.txt" ]
 }
 
 android_aar_prebuilt("google_play_services_nearby_java") {
@@ -198,22 +214,31 @@ android_aar_prebuilt("google_play_services_nearby_java") {
   _lib_name = "play-services-nearby"
   aar_path = "$gms_path/$_lib_name/$gms_version/$_lib_name-$gms_version.aar"
   info_path = "//build/secondary/third_party/android_tools/$target_name.info"
+  proguard_configs =
+      [ "${target_gen_dir}/google_play_services_basement_java/proguard.txt" ]
 }
 
 android_aar_prebuilt("google_play_services_vision_java") {
   deps = [
     ":google_play_services_base_java",
     ":google_play_services_basement_java",
+    ":google_play_services_vision_common_java",
   ]
   _lib_name = "play-services-vision"
   aar_path = "$gms_path/$_lib_name/$gms_version/$_lib_name-$gms_version.aar"
   info_path = "//build/secondary/third_party/android_tools/$target_name.info"
+  proguard_configs =
+      [ "${target_gen_dir}/google_play_services_basement_java/proguard.txt" ]
 }
 
-# TODO(paulmiller): Replace this with a proper target after rolling to a GMS
-# version which has vision-common.
-java_group("google_play_services_vision_common_java") {
+android_aar_prebuilt("google_play_services_vision_common_java") {
   deps = [
-    ":google_play_services_vision_java",
+    ":google_play_services_base_java",
+    ":google_play_services_basement_java",
   ]
+  _lib_name = "play-services-vision-common"
+  aar_path = "$gms_path/$_lib_name/$gms_version/$_lib_name-$gms_version.aar"
+  info_path = "//build/secondary/third_party/android_tools/$target_name.info"
+  proguard_configs =
+      [ "${target_gen_dir}/google_play_services_basement_java/proguard.txt" ]
 }
diff --git a/build/secondary/third_party/android_tools/google_play_services_auth_base_java.info b/build/secondary/third_party/android_tools/google_play_services_auth_base_java.info
@@ -5,7 +5,7 @@ aidl = [  ]
 assets = [  ]
 has_classes_jar = true
 has_native_libraries = false
-has_proguard_flags = true
+has_proguard_flags = false
 has_r_text_file = false
 is_manifest_empty = true
 resources = [  ]

diff --git a/build/secondary/third_party/android_tools/google_play_services_auth_java.info b/build/secondary/third_party/android_tools/google_play_services_auth_java.info
@@ -5,9 +5,9 @@ aidl = [  ]
 assets = [  ]
 has_classes_jar = true
 has_native_libraries = false
-has_proguard_flags = true
+has_proguard_flags = false
 has_r_text_file = false
 is_manifest_empty = false
-resources = [  ]
+resources = [ "res/drawable-watch-v20/common_google_signin_btn_text_dark_normal.xml", "res/drawable-watch-v20/common_google_signin_btn_text_disabled.xml", "res/drawable-watch-v20/common_google_signin_btn_text_light_normal.xml", "res/values-watch-v20/values.xml" ]
 subjar_tuples = [  ]
 subjars = [  ]
diff --git a/build/secondary/third_party/android_tools/google_play_services_base_java.info b/build/secondary/third_party/android_tools/google_play_services_base_java.info
@@ -5,9 +5,9 @@ aidl = [  ]
 assets = [  ]
 has_classes_jar = true
 has_native_libraries = false
-has_proguard_flags = true
+has_proguard_flags = false
 has_r_text_file = false
 is_manifest_empty = false
-resources = [ "res/color/common_google_signin_btn_text_dark.xml", "res/color/common_google_signin_btn_text_light.xml", "res/color/common_google_signin_btn_tint.xml", "res/drawable-hdpi-v4/common_full_open_on_phone.png", "res/drawable-hdpi-v4/common_google_signin_btn_icon_dark_normal_background.9.png", "res/drawable-hdpi-v4/common_google_signin_btn_icon_light_normal_background.9.png", "res/drawable-hdpi-v4/common_google_signin_btn_text_dark_normal_background.9.png", "res/drawable-hdpi-v4/common_google_signin_btn_text_light_normal_background.9.png", "res/drawable-hdpi-v4/googleg_disabled_color_18.png", "res/drawable-hdpi-v4/googleg_standard_color_18.png", "res/drawable-mdpi-v4/common_google_signin_btn_icon_dark_normal_background.9.png", "res/drawable-mdpi-v4/common_google_signin_btn_icon_light_normal_background.9.png", "res/drawable-mdpi-v4/common_google_signin_btn_text_dark_normal_background.9.png", "res/drawable-mdpi-v4/common_google_signin_btn_text_light_normal_background.9.png", "res/drawable-mdpi-v4/googleg_disabled_color_18.png", "res/drawable-mdpi-v4/googleg_standard_color_18.png", "res/drawable-xhdpi-v4/common_full_open_on_phone.png", "res/drawable-xhdpi-v4/common_google_signin_btn_icon_dark_normal_background.9.png", "res/drawable-xhdpi-v4/common_google_signin_btn_icon_light_normal_background.9.png", "res/drawable-xhdpi-v4/common_google_signin_btn_text_dark_normal_background.9.png", "res/drawable-xhdpi-v4/common_google_signin_btn_text_light_normal_background.9.png", "res/drawable-xhdpi-v4/googleg_disabled_color_18.png", "res/drawable-xhdpi-v4/googleg_standard_color_18.png", "res/drawable-xxhdpi-v4/common_google_signin_btn_icon_dark_normal_background.9.png", "res/drawable-xxhdpi-v4/common_google_signin_btn_icon_light_normal_background.9.png", "res/drawable-xxhdpi-v4/common_google_signin_btn_text_dark_normal_background.9.png", "res/drawable-xxhdpi-v4/common_google_signin_btn_text_light_normal_background.9.png", "res/drawable-xxhdpi-v4/googleg_disabled_color_18.png", "res/drawable-xxhdpi-v4/googleg_standard_color_18.png", "res/drawable/common_google_signin_btn_icon_dark.xml", "res/drawable/common_google_signin_btn_icon_dark_focused.xml", "res/drawable/common_google_signin_btn_icon_dark_normal.xml", "res/drawable/common_google_signin_btn_icon_disabled.xml", "res/drawable/common_google_signin_btn_icon_light.xml", "res/drawable/common_google_signin_btn_icon_light_focused.xml", "res/drawable/common_google_signin_btn_icon_light_normal.xml", "res/drawable/common_google_signin_btn_text_dark.xml", "res/drawable/common_google_signin_btn_text_dark_focused.xml", "res/drawable/common_google_signin_btn_text_dark_normal.xml", "res/drawable/common_google_signin_btn_text_disabled.xml", "res/drawable/common_google_signin_btn_text_light.xml", "res/drawable/common_google_signin_btn_text_light_focused.xml", "res/drawable/common_google_signin_btn_text_light_normal.xml", "res/values-af/values.xml", "res/values-am/values.xml", "res/values-ar/values.xml", "res/values-az/values.xml", "res/values-be/values.xml", "res/values-bg/values.xml", "res/values-bn/values.xml", "res/values-bs/values.xml", "res/values-ca/values.xml", "res/values-cs/values.xml", "res/values-da/values.xml", "res/values-de/values.xml", "res/values-el/values.xml", "res/values-en-rGB/values.xml", "res/values-es-rUS/values.xml", "res/values-es/values.xml", "res/values-et/values.xml", "res/values-eu/values.xml", "res/values-fa/values.xml", "res/values-fi/values.xml", "res/values-fr-rCA/values.xml", "res/values-fr/values.xml", "res/values-gl/values.xml", "res/values-gu/values.xml", "res/values-hi/values.xml", "res/values-hr/values.xml", "res/values-hu/values.xml", "res/values-hy/values.xml", "res/values-in/values.xml", "res/values-is/values.xml", "res/values-it/values.xml", "res/values-iw/values.xml", "res/values-ja/values.xml", "res/values-ka/values.xml", "res/values-kk/values.xml", "res/values-km/values.xml", "res/values-kn/values.xml", "res/values-ko/values.xml", "res/values-ky/values.xml", "res/values-lo/values.xml", "res/values-lt/values.xml", "res/values-lv/values.xml", "res/values-mk/values.xml", "res/values-ml/values.xml", "res/values-mn/values.xml", "res/values-mr/values.xml", "res/values-ms/values.xml", "res/values-my/values.xml", "res/values-nb/values.xml", "res/values-ne/values.xml", "res/values-nl/values.xml", "res/values-pa/values.xml", "res/values-pl/values.xml", "res/values-pt-rBR/values.xml", "res/values-pt-rPT/values.xml", "res/values-ro/values.xml", "res/values-ru/values.xml", "res/values-si/values.xml", "res/values-sk/values.xml", "res/values-sl/values.xml", "res/values-sq/values.xml", "res/values-sr/values.xml", "res/values-sv/values.xml", "res/values-sw/values.xml", "res/values-ta/values.xml", "res/values-te/values.xml", "res/values-th/values.xml", "res/values-tl/values.xml", "res/values-tr/values.xml", "res/values-uk/values.xml", "res/values-ur/values.xml", "res/values-uz/values.xml", "res/values-vi/values.xml", "res/values-zh-rCN/values.xml", "res/values-zh-rHK/values.xml", "res/values-zh-rTW/values.xml", "res/values-zu/values.xml", "res/values/values.xml" ]
+resources = [ "res/color/common_google_signin_btn_text_dark.xml", "res/color/common_google_signin_btn_text_light.xml", "res/color/common_google_signin_btn_tint.xml", "res/drawable-hdpi-v4/common_full_open_on_phone.png", "res/drawable-hdpi-v4/common_google_signin_btn_icon_dark_normal_background.9.png", "res/drawable-hdpi-v4/common_google_signin_btn_icon_light_normal_background.9.png", "res/drawable-hdpi-v4/common_google_signin_btn_text_dark_normal_background.9.png", "res/drawable-hdpi-v4/common_google_signin_btn_text_light_normal_background.9.png", "res/drawable-hdpi-v4/googleg_disabled_color_18.png", "res/drawable-hdpi-v4/googleg_standard_color_18.png", "res/drawable-mdpi-v4/common_google_signin_btn_icon_dark_normal_background.9.png", "res/drawable-mdpi-v4/common_google_signin_btn_icon_light_normal_background.9.png", "res/drawable-mdpi-v4/common_google_signin_btn_text_dark_normal_background.9.png", "res/drawable-mdpi-v4/common_google_signin_btn_text_light_normal_background.9.png", "res/drawable-mdpi-v4/googleg_disabled_color_18.png", "res/drawable-mdpi-v4/googleg_standard_color_18.png", "res/drawable-xhdpi-v4/common_full_open_on_phone.png", "res/drawable-xhdpi-v4/common_google_signin_btn_icon_dark_normal_background.9.png", "res/drawable-xhdpi-v4/common_google_signin_btn_icon_light_normal_background.9.png", "res/drawable-xhdpi-v4/common_google_signin_btn_text_dark_normal_background.9.png", "res/drawable-xhdpi-v4/common_google_signin_btn_text_light_normal_background.9.png", "res/drawable-xhdpi-v4/googleg_disabled_color_18.png", "res/drawable-xhdpi-v4/googleg_standard_color_18.png", "res/drawable-xxhdpi-v4/common_google_signin_btn_icon_dark_normal_background.9.png", "res/drawable-xxhdpi-v4/common_google_signin_btn_icon_light_normal_background.9.png", "res/drawable-xxhdpi-v4/common_google_signin_btn_text_dark_normal_background.9.png", "res/drawable-xxhdpi-v4/common_google_signin_btn_text_light_normal_background.9.png", "res/drawable-xxhdpi-v4/googleg_disabled_color_18.png", "res/drawable-xxhdpi-v4/googleg_standard_color_18.png", "res/drawable/common_google_signin_btn_icon_dark.xml", "res/drawable/common_google_signin_btn_icon_dark_focused.xml", "res/drawable/common_google_signin_btn_icon_dark_normal.xml", "res/drawable/common_google_signin_btn_icon_disabled.xml", "res/drawable/common_google_signin_btn_icon_light.xml", "res/drawable/common_google_signin_btn_icon_light_focused.xml", "res/drawable/common_google_signin_btn_icon_light_normal.xml", "res/drawable/common_google_signin_btn_text_dark.xml", "res/drawable/common_google_signin_btn_text_dark_focused.xml", "res/drawable/common_google_signin_btn_text_dark_normal.xml", "res/drawable/common_google_signin_btn_text_disabled.xml", "res/drawable/common_google_signin_btn_text_light.xml", "res/drawable/common_google_signin_btn_text_light_focused.xml", "res/drawable/common_google_signin_btn_text_light_normal.xml", "res/values-af/values.xml", "res/values-am/values.xml", "res/values-ar/values.xml", "res/values-az/values.xml", "res/values-b+sr+Latn/values.xml", "res/values-be/values.xml", "res/values-bg/values.xml", "res/values-bn/values.xml", "res/values-bs/values.xml", "res/values-ca/values.xml", "res/values-cs/values.xml", "res/values-da/values.xml", "res/values-de/values.xml", "res/values-el/values.xml", "res/values-en-rGB/values.xml", "res/values-es-rUS/values.xml", "res/values-es/values.xml", "res/values-et/values.xml", "res/values-eu/values.xml", "res/values-fa/values.xml", "res/values-fi/values.xml", "res/values-fr-rCA/values.xml", "res/values-fr/values.xml", "res/values-gl/values.xml", "res/values-gu/values.xml", "res/values-hi/values.xml", "res/values-hr/values.xml", "res/values-hu/values.xml", "res/values-hy/values.xml", "res/values-in/values.xml", "res/values-is/values.xml", "res/values-it/values.xml", "res/values-iw/values.xml", "res/values-ja/values.xml", "res/values-ka/values.xml", "res/values-kk/values.xml", "res/values-km/values.xml", "res/values-kn/values.xml", "res/values-ko/values.xml", "res/values-ky/values.xml", "res/values-lo/values.xml", "res/values-lt/values.xml", "res/values-lv/values.xml", "res/values-mk/values.xml", "res/values-ml/values.xml", "res/values-mn/values.xml", "res/values-mr/values.xml", "res/values-ms/values.xml", "res/values-my/values.xml", "res/values-nb/values.xml", "res/values-ne/values.xml", "res/values-nl/values.xml", "res/values-pa/values.xml", "res/values-pl/values.xml", "res/values-pt-rBR/values.xml", "res/values-pt-rPT/values.xml", "res/values-ro/values.xml", "res/values-ru/values.xml", "res/values-si/values.xml", "res/values-sk/values.xml", "res/values-sl/values.xml", "res/values-sq/values.xml", "res/values-sr/values.xml", "res/values-sv/values.xml", "res/values-sw/values.xml", "res/values-ta/values.xml", "res/values-te/values.xml", "res/values-th/values.xml", "res/values-tl/values.xml", "res/values-tr/values.xml", "res/values-uk/values.xml", "res/values-ur/values.xml", "res/values-uz/values.xml", "res/values-vi/values.xml", "res/values-zh-rCN/values.xml", "res/values-zh-rHK/values.xml", "res/values-zh-rTW/values.xml", "res/values-zu/values.xml", "res/values/values.xml" ]
 subjar_tuples = [  ]
 subjars = [  ]
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		31843001b7ce94fbdf71f2a9db76b28548a795fa
		76a1dca20a2697eb9250eb08424503259b8b6aa7
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		c0867d3d4daf1fad7d460bcfd27effdf15bbd450
		c812f827e8dd2cb28cb41003519f50d33fe64856