82 lines
3.5 KiB
Diff
82 lines
3.5 KiB
Diff
From: csagan5 <32685696+csagan5@users.noreply.github.com>
|
|
Date: Sun, 3 May 2020 12:15:33 +0200
|
|
Subject: Remove google_services_gcm
|
|
|
|
---
|
|
.../browser/language/AppLocaleUtils.java | 19 -------------------
|
|
third_party/android_deps/BUILD.gn | 18 ------------------
|
|
2 files changed, 37 deletions(-)
|
|
|
|
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/language/AppLocaleUtils.java b/chrome/android/java/src/org/chromium/chrome/browser/language/AppLocaleUtils.java
|
|
--- a/chrome/android/java/src/org/chromium/chrome/browser/language/AppLocaleUtils.java
|
|
+++ b/chrome/android/java/src/org/chromium/chrome/browser/language/AppLocaleUtils.java
|
|
@@ -8,11 +8,6 @@ import android.content.Context;
|
|
import android.preference.PreferenceManager;
|
|
import android.text.TextUtils;
|
|
|
|
-import com.google.android.play.core.splitcompat.SplitCompat;
|
|
-import com.google.android.play.core.splitinstall.SplitInstallManager;
|
|
-import com.google.android.play.core.splitinstall.SplitInstallManagerFactory;
|
|
-import com.google.android.play.core.splitinstall.SplitInstallRequest;
|
|
-
|
|
import org.chromium.base.BundleUtils;
|
|
import org.chromium.base.ContextUtils;
|
|
import org.chromium.chrome.browser.preferences.ChromePreferenceKeys;
|
|
@@ -75,25 +70,11 @@ public class AppLocaleUtils {
|
|
* @param context Activity context to enable downloaded language splits on.
|
|
*/
|
|
public static void maybeInstallActivitySplitCompat(Context context) {
|
|
- if (GlobalAppLocaleController.getInstance().isOverridden() && BundleUtils.isBundle()) {
|
|
- SplitCompat.installActivity(context);
|
|
- }
|
|
}
|
|
|
|
/**
|
|
* For bundle builds ensure that the language split for languageName is download.
|
|
*/
|
|
private static void ensureLaguageSplitInstalled(String languageName) {
|
|
- SplitInstallManager splitInstallManager =
|
|
- SplitInstallManagerFactory.create(ContextUtils.getApplicationContext());
|
|
-
|
|
- // TODO(perrier): check if languageName is already installed. https://crbug.com/1103806
|
|
- if (languageName != null) {
|
|
- SplitInstallRequest installRequest =
|
|
- SplitInstallRequest.newBuilder()
|
|
- .addLanguage(Locale.forLanguageTag(languageName))
|
|
- .build();
|
|
- splitInstallManager.startInstall(installRequest);
|
|
- }
|
|
}
|
|
}
|
|
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
|
|
@@ -1061,24 +1061,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_gcm_java") {
|
|
- aar_path = "libs/com_google_android_gms_play_services_gcm/play-services-gcm-17.0.0.aar"
|
|
- info_path = "libs/com_google_android_gms_play_services_gcm/com_google_android_gms_play_services_gcm.info"
|
|
- deps = [
|
|
- ":androidx_collection_collection_java",
|
|
- ":androidx_core_core_java",
|
|
- ":androidx_legacy_legacy_support_core_utils_java",
|
|
- ":google_play_services_base_java",
|
|
- ":google_play_services_basement_java",
|
|
- ":google_play_services_iid_java",
|
|
- ":google_play_services_stats_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("com_google_android_material_material_java") {
|
|
aar_path =
|
|
--
|
|
2.17.1
|
|
|