From: Wengling Chen Date: Sat, 2 Nov 2019 09:22:31 +0100 Subject: Remove dependency on com.google.android.gms.auth --- chrome/android/BUILD.gn | 1 - .../signin/core/browser/android/BUILD.gn | 1 - .../components/signin/AccountIdProvider.java | 10 +---- .../signin/SystemAccountManagerDelegate.java | 15 +------ content/public/android/BUILD.gn | 1 - content/test/BUILD.gn | 1 - third_party/android_deps/BUILD.gn | 44 ------------------- third_party/robolectric/BUILD.gn | 1 - 8 files changed, 2 insertions(+), 72 deletions(-) diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn --- a/chrome/android/BUILD.gn +++ b/chrome/android/BUILD.gn @@ -222,7 +222,6 @@ android_library("chrome_java") { ":partner_location_descriptor_proto_java", ":update_proto_java", ":usage_stats_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_framework_java", diff --git a/components/signin/core/browser/android/BUILD.gn b/components/signin/core/browser/android/BUILD.gn --- a/components/signin/core/browser/android/BUILD.gn +++ b/components/signin/core/browser/android/BUILD.gn @@ -14,7 +14,6 @@ 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", diff --git a/components/signin/core/browser/android/java/src/org/chromium/components/signin/AccountIdProvider.java b/components/signin/core/browser/android/java/src/org/chromium/components/signin/AccountIdProvider.java --- a/components/signin/core/browser/android/java/src/org/chromium/components/signin/AccountIdProvider.java +++ b/components/signin/core/browser/android/java/src/org/chromium/components/signin/AccountIdProvider.java @@ -6,9 +6,6 @@ package org.chromium.components.signin; import androidx.annotation.VisibleForTesting; -import com.google.android.gms.common.ConnectionResult; -import com.google.android.gms.common.GoogleApiAvailability; - import org.chromium.base.ContextUtils; import org.chromium.base.Log; import org.chromium.base.StrictModeContext; @@ -48,12 +45,7 @@ public class AccountIdProvider { * Google Play services is available. */ public boolean canBeUsed() { - // TODO(http://crbug.com/577190): Remove StrictMode override. - try (StrictModeContext ignored = StrictModeContext.allowDiskWrites()) { - int resultCode = GoogleApiAvailability.getInstance().isGooglePlayServicesAvailable( - ContextUtils.getApplicationContext()); - return resultCode == ConnectionResult.SUCCESS; - } + return false; } /** diff --git a/components/signin/core/browser/android/java/src/org/chromium/components/signin/SystemAccountManagerDelegate.java b/components/signin/core/browser/android/java/src/org/chromium/components/signin/SystemAccountManagerDelegate.java --- a/components/signin/core/browser/android/java/src/org/chromium/components/signin/SystemAccountManagerDelegate.java +++ b/components/signin/core/browser/android/java/src/org/chromium/components/signin/SystemAccountManagerDelegate.java @@ -24,9 +24,6 @@ import android.os.PatternMatcher; import android.os.Process; import android.os.SystemClock; -import com.google.android.gms.common.ConnectionResult; -import com.google.android.gms.common.GoogleApiAvailability; - import org.chromium.base.ApiCompatibilityUtils; import org.chromium.base.Callback; import org.chromium.base.ContextUtils; @@ -82,17 +79,7 @@ public class SystemAccountManagerDelegate implements AccountManagerDelegate { } protected void checkCanUseGooglePlayServices() throws AccountManagerDelegateException { - Context context = ContextUtils.getApplicationContext(); - final int resultCode = - GoogleApiAvailability.getInstance().isGooglePlayServicesAvailable(context); - if (resultCode == ConnectionResult.SUCCESS) { - return; - } - - throw new GmsAvailabilityException( - String.format("Can't use Google Play Services: %s", - GoogleApiAvailability.getInstance().getErrorString(resultCode)), - resultCode); + throw new GmsAvailabilityException("Can't use Google Play Services", 1); } @Override diff --git a/content/public/android/BUILD.gn b/content/public/android/BUILD.gn --- a/content/public/android/BUILD.gn +++ b/content/public/android/BUILD.gn @@ -49,7 +49,6 @@ action("generate_sandboxed_service_srcjar") { android_library("content_java") { deps = [ ":content_java_resources", - "$google_play_services_package:google_play_services_auth_api_phone_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_tasks_java", diff --git a/content/test/BUILD.gn b/content/test/BUILD.gn --- a/content/test/BUILD.gn +++ b/content/test/BUILD.gn @@ -2344,7 +2344,6 @@ if (is_android) { testonly = true sources = content_java_sources_needing_jni deps = [ - "$google_play_services_package:google_play_services_auth_api_phone_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_tasks_java", diff --git a/third_party/android_deps/BUILD.gn b/third_party/android_deps/BUILD.gn --- a/third_party/android_deps/BUILD.gn +++ b/third_party/android_deps/BUILD.gn @@ -850,50 +850,6 @@ java_prebuilt("com_android_tools_build_jetifier_jetifier_processor_java") { ] } -# This is generated, do not edit. Update BuildConfigGenerator.groovy instead. -android_aar_prebuilt("google_play_services_auth_java") { - aar_path = "libs/com_google_android_gms_play_services_auth/play-services-auth-15.0.1.aar" - info_path = "libs/com_google_android_gms_play_services_auth/com_google_android_gms_play_services_auth.info" - 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", - ] - - # Removing drawables from GMS .aars as they are unused bloat. - strip_drawables = true -} - -# This is generated, do not edit. Update BuildConfigGenerator.groovy instead. -android_aar_prebuilt("google_play_services_auth_api_phone_java") { - aar_path = "libs/com_google_android_gms_play_services_auth_api_phone/play-services-auth-api-phone-15.0.1.aar" - info_path = "libs/com_google_android_gms_play_services_auth_api_phone/com_google_android_gms_play_services_auth_api_phone.info" - deps = [ - ":google_play_services_base_java", - ":google_play_services_basement_java", - ":google_play_services_tasks_java", - ] - - # Removing drawables from GMS .aars as they are unused bloat. - strip_drawables = true -} - -# This is generated, do not edit. Update BuildConfigGenerator.groovy instead. -android_aar_prebuilt("google_play_services_auth_base_java") { - aar_path = "libs/com_google_android_gms_play_services_auth_base/play-services-auth-base-15.0.1.aar" - info_path = "libs/com_google_android_gms_play_services_auth_base/com_google_android_gms_play_services_auth_base.info" - deps = [ - ":google_play_services_base_java", - ":google_play_services_basement_java", - ":google_play_services_tasks_java", - ] - - # Removing drawables from GMS .aars as they are unused bloat. - strip_drawables = true -} - # This is generated, do not edit. Update BuildConfigGenerator.groovy instead. android_aar_prebuilt("google_play_services_base_java") { aar_path = "libs/com_google_android_gms_play_services_base/play-services-base-15.0.1.aar" diff --git a/third_party/robolectric/BUILD.gn b/third_party/robolectric/BUILD.gn --- a/third_party/robolectric/BUILD.gn +++ b/third_party/robolectric/BUILD.gn @@ -939,7 +939,6 @@ java_library("shadows_play_services_java") { ":robolectric_shadowapi_java", ":robolectric_utils_java", ":shadows_core_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_deps:android_support_v4_java", -- 2.17.1