Commit dbb8df33 authored by Zhiqiang Zhang's avatar Zhiqiang Zhang Committed by Commit Bot

Update Google Play services SDK to 12.0.1

- Added cast-framework and fido client for feature development.
- Added auth-api-phone client, which is a missing dependency of auth
- Updated BUILD.gn dependencies as they were out of date.

Bug: 822826
Change-Id: I3076868f6607511ac911a26de482e4a645cedf56
Reviewed-on: https://chromium-review.googlesource.com/1105459Reviewed-by: default avatarJohn Budorick <jbudorick@chromium.org>
Reviewed-by: default avatarPaul Miller <paulmiller@chromium.org>
Reviewed-by: default avatarKim Paulhamus <kpaulhamus@chromium.org>
Commit-Queue: Zhiqiang Zhang <zqzhang@chromium.org>
Cr-Commit-Position: refs/heads/master@{#568473}
parent e5fde3fe
76a1dca20a2697eb9250eb08424503259b8b6aa7
\ No newline at end of file
4d3bbf27839164e89417facf4906ab33222fa382
\ No newline at end of file
{
"clients": [
"play-services-auth-api-phone",
"play-services-auth-base",
"play-services-auth",
"play-services-base",
"play-services-basement",
"play-services-cast",
"play-services-cast-framework",
"play-services-fido",
"play-services-gcm",
"play-services-iid",
"play-services-location",
......@@ -12,6 +15,6 @@
"play-services-vision",
"play-services-vision-common"
],
"version_number": "11.2.0",
"version_number": "12.0.1",
"version_xml_path": "res/values/version.xml"
}
c812f827e8dd2cb28cb41003519f50d33fe64856
\ No newline at end of file
914b84f58cf521f911d97a524562d3117855df77
\ No newline at end of file
......@@ -106,7 +106,7 @@ if (enable_java_templates) {
# 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 = "11.2.0"
gms_version = "12.0.1"
android_aar_prebuilt("google_play_services_basement_java") {
deps = [
......@@ -146,6 +146,7 @@ if (enable_java_templates) {
deps = [
":google_play_services_base_java",
":google_play_services_basement_java",
":google_play_services_tasks_java",
]
_lib_name = "play-services-auth-base"
aar_path = "$gms_path/$_lib_name/$gms_version/$_lib_name-$gms_version.aar"
......@@ -154,11 +155,26 @@ if (enable_java_templates) {
[ "${target_gen_dir}/google_play_services_basement_java/proguard.txt" ]
}
android_aar_prebuilt("google_play_services_auth_api_phone_java") {
deps = [
":google_play_services_base_java",
":google_play_services_basement_java",
":google_play_services_tasks_java",
]
_lib_name = "play-services-auth-api-phone"
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") {
deps = [
":google_play_services_auth_api_phone_java",
":google_play_services_auth_base_java",
":google_play_services_base_java",
":google_play_services_basement_java",
":google_play_services_tasks_java",
]
_lib_name = "play-services-auth"
aar_path = "$gms_path/$_lib_name/$gms_version/$_lib_name-$gms_version.aar"
......@@ -172,6 +188,7 @@ if (enable_java_templates) {
":android_support_v7_mediarouter_java",
":google_play_services_base_java",
":google_play_services_basement_java",
":google_play_services_tasks_java",
]
_lib_name = "play-services-cast"
aar_path = "$gms_path/$_lib_name/$gms_version/$_lib_name-$gms_version.aar"
......@@ -180,10 +197,24 @@ if (enable_java_templates) {
[ "${target_gen_dir}/google_play_services_basement_java/proguard.txt" ]
}
android_aar_prebuilt("google_play_services_cast_framework_java") {
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"
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") {
deps = [
":google_play_services_base_java",
":google_play_services_basement_java",
":google_play_services_tasks_java",
]
_lib_name = "play-services-iid"
aar_path = "$gms_path/$_lib_name/$gms_version/$_lib_name-$gms_version.aar"
......@@ -209,6 +240,7 @@ if (enable_java_templates) {
deps = [
":google_play_services_base_java",
":google_play_services_basement_java",
":google_play_services_tasks_java",
]
_lib_name = "play-services-location"
aar_path = "$gms_path/$_lib_name/$gms_version/$_lib_name-$gms_version.aar"
......@@ -241,4 +273,17 @@ if (enable_java_templates) {
proguard_configs =
[ "${target_gen_dir}/google_play_services_basement_java/proguard.txt" ]
}
android_aar_prebuilt("google_play_services_fido_java") {
deps = [
":google_play_services_base_java",
":google_play_services_basement_java",
":google_play_services_tasks_java",
]
_lib_name = "play-services-fido"
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" ]
}
}
# Generated by //build/android/gyp/aar.py
# To regenerate, use "update_android_aar_prebuilts = true" and run "gn gen".
aidl = [ ]
assets = [ ]
has_classes_jar = true
has_native_libraries = false
has_proguard_flags = false
has_r_text_file = false
is_manifest_empty = true
resources = [ ]
subjar_tuples = [ ]
subjars = [ ]
......@@ -5,7 +5,7 @@ aidl = [ ]
assets = [ ]
has_classes_jar = true
has_native_libraries = false
has_proguard_flags = false
has_proguard_flags = true
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-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" ]
......
# Generated by //build/android/gyp/aar.py
# To regenerate, use "update_android_aar_prebuilts = true" and run "gn gen".
aidl = [ ]
assets = [ ]
has_classes_jar = true
has_native_libraries = false
has_proguard_flags = true
has_r_text_file = false
is_manifest_empty = true
resources = [ ]
subjar_tuples = [ ]
subjars = [ ]
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment