Remove-dependency-on-com.google.android.gms.gcm.patch
This commit is contained in:
none
parent
988829e593
commit
6500bf6c28
1 changed files with 31 additions and 39 deletions
|
|
@ -7,19 +7,19 @@ The snippets are already disabled in native codes, this will disable it on Java
|
|||
---
|
||||
chrome/android/BUILD.gn | 11 --
|
||||
components/background_task_scheduler/BUILD.gn | 1 -
|
||||
.../internal/BUILD.gn | 3 -
|
||||
.../internal/BUILD.gn | 2 -
|
||||
.../BackgroundTaskGcmTaskService.java | 160 ------------------
|
||||
...ackgroundTaskSchedulerFactoryInternal.java | 6 +-
|
||||
...kgroundTaskSchedulerGcmNetworkManager.java | 60 -------
|
||||
.../gms/ChromiumPlayServicesAvailability.java | 10 +-
|
||||
7 files changed, 3 insertions(+), 248 deletions(-)
|
||||
7 files changed, 3 insertions(+), 247 deletions(-)
|
||||
delete mode 100644 components/background_task_scheduler/internal/android/java/src/org/chromium/components/background_task_scheduler/internal/BackgroundTaskGcmTaskService.java
|
||||
delete mode 100644 components/background_task_scheduler/internal/android/java/src/org/chromium/components/background_task_scheduler/internal/BackgroundTaskSchedulerGcmNetworkManager.java
|
||||
|
||||
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
|
||||
--- a/chrome/android/BUILD.gn
|
||||
+++ b/chrome/android/BUILD.gn
|
||||
@@ -283,7 +283,6 @@ android_library("chrome_java") {
|
||||
@@ -281,7 +281,6 @@ android_library("chrome_java") {
|
||||
"$google_play_services_package:google_play_services_cast_framework_java",
|
||||
"$google_play_services_package:google_play_services_cast_java",
|
||||
"$google_play_services_package:google_play_services_fido_java",
|
||||
|
|
@ -27,7 +27,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
|
|||
"$google_play_services_package:google_play_services_iid_java",
|
||||
"$google_play_services_package:google_play_services_tasks_java",
|
||||
"//base:base_java",
|
||||
@@ -995,7 +994,6 @@ android_library("chrome_test_java") {
|
||||
@@ -1032,7 +1031,6 @@ android_library("chrome_test_java") {
|
||||
"$google_play_services_package:google_play_services_cast_framework_java",
|
||||
"$google_play_services_package:google_play_services_cast_java",
|
||||
"$google_play_services_package:google_play_services_fido_java",
|
||||
|
|
@ -35,7 +35,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
|
|||
"$google_play_services_package:google_play_services_iid_java",
|
||||
"$google_play_services_package:google_play_services_tasks_java",
|
||||
"//base:base_java",
|
||||
@@ -1950,7 +1948,6 @@ android_library("browser_java_test_support") {
|
||||
@@ -2009,7 +2007,6 @@ android_library("browser_java_test_support") {
|
||||
]
|
||||
deps = [
|
||||
":chrome_java",
|
||||
|
|
@ -43,28 +43,28 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
|
|||
"//base:base_java",
|
||||
"//base:base_java_test_support",
|
||||
"//chrome/browser/profiles/android:java",
|
||||
@@ -2089,8 +2086,6 @@ android_library("base_monochrome_module_java") {
|
||||
@@ -2149,8 +2146,6 @@ android_library("base_monochrome_module_java") {
|
||||
# enable_chrome_module is true and //chrome code is in a DFM.
|
||||
android_library("base_module_java") {
|
||||
sources = [
|
||||
- "java/src/com/google/ipc/invalidation/ticl/android2/channel/GcmRegistrationTaskService.java",
|
||||
- "java/src/org/chromium/chrome/browser/ChromeBackgroundService.java",
|
||||
"java/src/org/chromium/chrome/browser/ChromeBackupAgent.java",
|
||||
"java/src/org/chromium/chrome/browser/base/MainDexApplicationImpl.java",
|
||||
"java/src/org/chromium/chrome/browser/base/SplitChromeApplication.java",
|
||||
@@ -2098,8 +2093,6 @@ android_library("base_module_java") {
|
||||
"java/src/org/chromium/chrome/browser/base/SplitCompatApplication.java",
|
||||
"java/src/org/chromium/chrome/browser/DeferredStartupHandler.java",
|
||||
"java/src/org/chromium/chrome/browser/base/DexFixer.java",
|
||||
@@ -2161,8 +2156,6 @@ android_library("base_module_java") {
|
||||
"java/src/org/chromium/chrome/browser/base/SplitCompatBackupAgent.java",
|
||||
"java/src/org/chromium/chrome/browser/base/SplitCompatContentProvider.java",
|
||||
"java/src/org/chromium/chrome/browser/base/SplitCompatCustomTabsService.java",
|
||||
- "java/src/org/chromium/chrome/browser/base/SplitCompatGcmListenerService.java",
|
||||
- "java/src/org/chromium/chrome/browser/base/SplitCompatGcmTaskService.java",
|
||||
"java/src/org/chromium/chrome/browser/base/SplitCompatIntentService.java",
|
||||
"java/src/org/chromium/chrome/browser/base/SplitCompatJobService.java",
|
||||
"java/src/org/chromium/chrome/browser/base/SplitCompatMinidumpUploadJobService.java",
|
||||
@@ -2121,14 +2114,10 @@ android_library("base_module_java") {
|
||||
"java/src/org/chromium/chrome/browser/omaha/OmahaClient.java",
|
||||
@@ -2191,14 +2184,10 @@ android_library("base_module_java") {
|
||||
"java/src/org/chromium/chrome/browser/photo_picker/DecoderService.java",
|
||||
"java/src/org/chromium/chrome/browser/prerender/ChromePrerenderService.java",
|
||||
"java/src/org/chromium/chrome/browser/provider/ChromeBrowserProvider.java",
|
||||
- "java/src/org/chromium/chrome/browser/services/gcm/ChromeGcmListenerService.java",
|
||||
- "java/src/org/chromium/chrome/browser/services/gcm/GCMBackgroundService.java",
|
||||
- "java/src/org/chromium/chrome/browser/services/gcm/InvalidationGcmUpstreamSender.java",
|
||||
|
|
@ -74,13 +74,13 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
|
|||
":chrome_base_module_resources",
|
||||
- "$google_play_services_package:google_play_services_gcm_java",
|
||||
"//base:base_java",
|
||||
"//components/embedder_support/android:application_java",
|
||||
"//components/media_router/browser/android:cast_options_provider_java",
|
||||
"//base:jni_java",
|
||||
"//chrome/browser/download/android:file_provider_java",
|
||||
diff --git a/components/background_task_scheduler/BUILD.gn b/components/background_task_scheduler/BUILD.gn
|
||||
--- a/components/background_task_scheduler/BUILD.gn
|
||||
+++ b/components/background_task_scheduler/BUILD.gn
|
||||
@@ -123,7 +123,6 @@ if (is_android) {
|
||||
"$google_play_services_package:google_play_services_auth_base_java",
|
||||
@@ -122,7 +122,6 @@ if (is_android) {
|
||||
":background_task_scheduler_task_ids_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_gcm_java",
|
||||
|
|
@ -90,15 +90,7 @@ diff --git a/components/background_task_scheduler/BUILD.gn b/components/backgrou
|
|||
diff --git a/components/background_task_scheduler/internal/BUILD.gn b/components/background_task_scheduler/internal/BUILD.gn
|
||||
--- a/components/background_task_scheduler/internal/BUILD.gn
|
||||
+++ b/components/background_task_scheduler/internal/BUILD.gn
|
||||
@@ -11,7 +11,6 @@ if (is_android) {
|
||||
android_library("internal_java") {
|
||||
sources = [
|
||||
"android/java/src/org/chromium/components/background_task_scheduler/internal/BackgroundTaskBroadcastReceiver.java",
|
||||
- "android/java/src/org/chromium/components/background_task_scheduler/internal/BackgroundTaskGcmTaskService.java",
|
||||
"android/java/src/org/chromium/components/background_task_scheduler/internal/BackgroundTaskJobService.java",
|
||||
"android/java/src/org/chromium/components/background_task_scheduler/internal/BackgroundTaskSchedulerAlarmManager.java",
|
||||
"android/java/src/org/chromium/components/background_task_scheduler/internal/BackgroundTaskSchedulerDelegate.java",
|
||||
@@ -28,7 +27,6 @@ if (is_android) {
|
||||
@@ -27,7 +27,6 @@ if (is_android) {
|
||||
":proto_java",
|
||||
"$google_play_services_package:google_play_services_base_java",
|
||||
"$google_play_services_package:google_play_services_basement_java",
|
||||
|
|
@ -106,7 +98,7 @@ diff --git a/components/background_task_scheduler/internal/BUILD.gn b/components
|
|||
"$google_play_services_package:google_play_services_tasks_java",
|
||||
"//base:base_java",
|
||||
"//components/background_task_scheduler:background_task_scheduler_task_ids_java",
|
||||
@@ -100,7 +98,6 @@ if (is_android) {
|
||||
@@ -99,7 +98,6 @@ if (is_android) {
|
||||
":internal_java",
|
||||
"$google_play_services_package:google_play_services_base_java",
|
||||
"$google_play_services_package:google_play_services_basement_java",
|
||||
|
|
@ -289,7 +281,7 @@ diff --git a/components/background_task_scheduler/internal/android/java/src/org/
|
|||
- if (sdkInt >= Build.VERSION_CODES.M) {
|
||||
- return new BackgroundTaskSchedulerJobService();
|
||||
- } else {
|
||||
- return new BackgroundTaskSchedulerGcmNetworkManager();
|
||||
- return new BackgroundTaskSchedulerJobService();
|
||||
- }
|
||||
+ return new BackgroundTaskSchedulerJobService();
|
||||
}
|
||||
|
|
@ -370,20 +362,10 @@ diff --git a/third_party/android_deps/util/org/chromium/gms/ChromiumPlayServices
|
|||
-import com.google.android.gms.common.ConnectionResult;
|
||||
-import com.google.android.gms.common.GoogleApiAvailability;
|
||||
-
|
||||
// Refer to go/doubledown-play-services#new-apis for more detail.
|
||||
public final class ChromiumPlayServicesAvailability {
|
||||
/**
|
||||
* The minimum GMS version we're requesting. isGooglePlayServicesAvailable will fail if the
|
||||
@@ -30,8 +27,7 @@ public final class ChromiumPlayServicesAvailability {
|
||||
* PM/UX.
|
||||
*/
|
||||
public static int getGooglePlayServicesConnectionResult(final Context context) {
|
||||
- return GoogleApiAvailability.getInstance().isGooglePlayServicesAvailable(
|
||||
- context, GMS_VERSION_NUMBER);
|
||||
+ return 16; // API_UNAVAILABLE
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -44,8 +40,6 @@ public final class ChromiumPlayServicesAvailability {
|
||||
@@ -30,9 +27,7 @@ public final class ChromiumPlayServicesAvailability {
|
||||
* PM/UX.
|
||||
*/
|
||||
public static boolean isGooglePlayServicesAvailable(final Context context) {
|
||||
|
|
@ -392,6 +374,16 @@ diff --git a/third_party/android_deps/util/org/chromium/gms/ChromiumPlayServices
|
|||
- == ConnectionResult.SUCCESS;
|
||||
+ return false;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -50,7 +45,6 @@ public final class ChromiumPlayServicesAvailability {
|
||||
* PM/UX.
|
||||
*/
|
||||
public static int getGooglePlayServicesConnectionResult(final Context context) {
|
||||
- return GoogleApiAvailability.getInstance().isGooglePlayServicesAvailable(
|
||||
- context, GMS_VERSION_NUMBER);
|
||||
+ return 16; // API_UNAVAILABLE
|
||||
}
|
||||
}
|
||||
--
|
||||
2.17.1
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue