Browse Source

Update to 78.0.3904.97-1

tags/78.0.3904.97-1^0 78.0.3904.97-1
wchen342 1 year ago
parent
commit
1c507c20ca
Signed by untrusted user: wchen342 GPG Key ID: 720B70365E800508
29 changed files with 2789 additions and 626 deletions
  1. +0
    -1
      .gclient
  2. +6
    -1
      CHANGELOG.md
  3. +1
    -1
      android_flags.gn
  4. +28
    -10
      build.sh
  5. +0
    -0
      misc/android_studio_setup.sh
  6. +1
    -1
      patches/Unobtainium/kill-Auth.patch
  7. +30
    -21
      patches/Unobtainium/kill-GCM.patch
  8. +0
    -11
      patches/Unobtainium/kill-TOS-and-metrics-opt-out.patch
  9. +1
    -1
      patches/Vanadium/0021-disable-media-router-by-default.patch
  10. +6
    -4
      patches/android-prune-domain-fix.patch
  11. +1
    -1
      patches/series
  12. +27
    -46
      patches/src-fix/fix-closure-compiler-minify-error.patch
  13. +3
    -3
      patches/src-fix/fix-null-mInstanceID.patch
  14. +20
    -0
      patches/src-fix/fix-unkown-warning-clang-9.patch
  15. +1
    -1
      patches/ungoogled-chromium-android/Remove-dependency-on-com.google.android.gcm.patch
  16. +28
    -28
      patches/ungoogled-chromium-android/Remove-dependency-on-com.google.android.gms.cast.patch
  17. +54
    -15
      patches/ungoogled-chromium-android/Remove-dependency-on-com.google.android.gms.common-auth-signin-dynamic-com.google.android.gms.tasks.patch
  18. +15
    -15
      patches/ungoogled-chromium-android/Remove-dependency-on-com.google.android.gms.fido-com.google.android.gms.iid-com.google.android.gms.instantapps-com.google.android.gms.location.patch
  19. +4
    -4
      patches/ungoogled-chromium-android/Remove-dependency-on-com.google.android.gms.flags-com.google.android.gms.location.places-com.google.android.gms.stats.patch
  20. +14
    -23
      patches/ungoogled-chromium-android/Remove-dependency-on-com.google.android.gms.gcm.patch
  21. +12
    -12
      patches/ungoogled-chromium-android/Remove-dependency-on-com.google.android.gms.vision-com.google.android.gms.clearcut-com.google.android.gms.phenotype.patch
  22. +1
    -1
      patches/ungoogled-chromium-android/Remove-dependency-on-com.google.android.play.patch
  23. +1
    -1
      patches/ungoogled-chromium-android/change-package-name-chromium.patch
  24. +1
    -1
      patches/ungoogled-chromium-android/disable-context-search-by-default.patch
  25. +14
    -4
      patches/ungoogled-chromium-android/linker-android-support-remove.patch
  26. +0
    -19
      patches/ungoogled-chromium-android/uncheck-fre-send-report.patch
  27. +1
    -2
      pruning_2.list
  28. +434
    -399
      safe_browsing_proto_files/download_file_types.pb.h
  29. +2085
    -0
      safe_browsing_proto_files/webprotect.pb.h

+ 0
- 1
.gclient View File

@ -71,7 +71,6 @@ solutions = [
"src/third_party/webrtc": None,
"src/tools/page_cycler/acid3": None,
"src/tools/swarming_client": None,
"src/third_party/android_ndk": None,
"src/third_party/elfutils/src": None,
"src/third_party/android_tools": None,
"src/third_party/android_sdk/public": None,


+ 6
- 1
CHANGELOG.md View File

@ -33,4 +33,9 @@
# 77.0.3865.90-1
* Update patches to new version
* Update GN to latest commit
* Minor fixes
* Minor fixes
# 78.0.3904.97-1
* Update scripts and patches to new version
* Merge patches from Bromite and Unobtainium
* New dependencies: nodejs binaries, lib files from ndk

+ 1
- 1
android_flags.gn View File

@ -1,7 +1,7 @@
android_channel="stable"
android32_ndk_api_level=21
android64_ndk_api_level=21
android_ndk_root = "//../android-ndk/android-ndk-r18b"
android_ndk_root = "//third_party/android_ndk"
android_ndk_version = "r18b"
android_ndk_major_version = 18
android_sdk_build_tools_version="27.0.3"


+ 28
- 10
build.sh View File

@ -1,15 +1,16 @@
#!/usr/bin/env bash
set -eux -o pipefail
chromium_version=77.0.3865.90
chromium_version=78.0.3904.97
ungoogled_chromium_revision=2
target=monochrome_public_apk
webview_target=system_webview_apk
# Required tools: python2, python3, ninja, git, clang, lld, llvm, curl
# Required tools: python2, python3, ninja, git, clang, lld, llvm, curl, wget, npm
# Assuming default python to be python2. This is true on most Linux distributions.
## Clone ungoogled-chromium repo
git clone https://github.com/Eloston/ungoogled-chromium.git -b ${chromium_version}-1
git clone https://github.com/Eloston/ungoogled-chromium.git -b ${chromium_version}-${ungoogled_chromium_revision}
## Clone chromium repo
git clone --depth 1 --no-tags https://chromium.googlesource.com/chromium/src.git -b ${chromium_version}
@ -24,6 +25,9 @@ git fetch --depth 1 --no-tags origin "${depot_tools_commit}"
git reset --hard FETCH_HEAD
popd
export PATH="$(pwd -P)/depot_tools:$PATH"
pushd src/third_party
ln -s ../../depot_tools
popd
## Sync files
@ -59,7 +63,7 @@ git fetch --depth 1 --no-tags origin "${libsync_commit}"
git reset --hard FETCH_HEAD
popd
gn_commit=bbc9dd04ea881b4bc0c36a1ff4ccc65111bab250
gn_commit=a0a58ab261297009f1181222ac82ee6247e398ad
mv src/tools/gn src/tools/gn.bak
git clone https://gn.googlesource.com/gn src/tools/gn
pushd src/tools/gn
@ -69,9 +73,12 @@ cp -r src/tools/gn.bak/bootstrap src/tools/gn
## Hooks
python src/build/util/lastchange.py -o src/build/util/LASTCHANGE
python src/chrome/android/profiles/update_afdo_profile.py
python src/tools/download_cros_provided_profile.py --newest_state=src/chrome/android/profiles/newest.txt --local_state=src/chrome/android/profiles/local.txt --output_name=src/chrome/android/profiles/afdo.prof --gs_url_base=chromeos-prebuilt/afdo-job/llvm
python src/build/util/lastchange.py -m GPU_LISTS_VERSION --revision-id-only --header src/gpu/config/gpu_lists_version.h
python src/build/util/lastchange.py -m SKIA_COMMIT_HASH -s src/third_party/skia --header src/skia/ext/skia_commit_hash.h
# New binary dependency: node, caused by webui
src/third_party/node/update_node_binaries
src/third_party/node/update_npm_deps
## Run ungoogled-chromium scripts
@ -91,8 +98,8 @@ python3 ungoogled-chromium/utils/domain_substitution.py apply -r ungoogled-chrom
# Workaround for a building failure caused by safe browsing. The file is pre-generated with safe_browsing_mode=2. See https://github.com/nikolowry/bromite-builder/issues/1
# arm/arm64
cp download_file_types.pb.h src/chrome/common/safe_browsing/download_file_types.pb.h
cp safe_browsing_proto_files/download_file_types.pb.h src/chrome/common/safe_browsing/download_file_types.pb.h
cp safe_browsing_proto_files/webprotect.pb.h src/components/safe_browsing/proto/webprotect.pb.h
## Prepare Android SDK/NDK
@ -131,6 +138,17 @@ ln -s ../../../../android-sdk/android-sdk_user.9.0.0_r21_linux-x86/platform-tool
ln -s ../../../../android-sdk/android-sdk_user.9.0.0_r21_linux-x86/tools tools
popd
# remove ndk folders
DIRECTORY="src/third_party/android_ndk"
gn_file="BUILD.gn"
cp -a "${DIRECTORY}/${gn_file}" android-ndk/android-ndk-r18b
cp -ar "${DIRECTORY}/toolchains/llvm/prebuilt/linux-x86_64" android-ndk/android-ndk-r18b/toolchains/llvm/prebuilt # Need libgcc.a otherwise compilation will fail
pushd "${DIRECTORY}"
cd ..
rm -rf android_ndk
ln -s ../../android-ndk/android-ndk-r18b android_ndk
popd
## Compile third-party binaries
# error-prone, from Maven repo
@ -180,7 +198,7 @@ python3 ungoogled-chromium/utils/domain_substitution.py apply -r ungoogled-chrom
## Genarate gn file
pushd src/tools/gn
build/gen.py
ninja -C out gn
/usr/bin/ninja -C out gn
popd
@ -198,5 +216,5 @@ export CC=${CC:=clang}
export CXX=${CXX:=clang++}
## Build
ninja -C out/Default ${target}
ninja -C out/Default ${webview_target}
/usr/bin/ninja -C out/Default ${target}
/usr/bin/ninja -C out/Default ${webview_target}

+ 0
- 0
misc/android_studio_setup.sh View File


+ 1
- 1
patches/Unobtainium/kill-Auth.patch View File

@ -138,7 +138,7 @@ diff --git a/components/signin/core/browser/android/java/src/org/chromium/compon
}
@Override
@@ -187,17 +154,6 @@ public class SystemAccountManagerDelegate implements AccountManagerDelegate {
@@ -197,17 +164,6 @@ public class SystemAccountManagerDelegate implements AccountManagerDelegate {
@SuppressLint("MissingPermission")
@Override
public void createAddAccountIntent(Callback<Intent> callback) {


+ 30
- 21
patches/Unobtainium/kill-GCM.patch View File

@ -17,17 +17,17 @@ Subject: kill GCM
.../BackgroundTaskSchedulerGcmNetworkManager.java | 206 +--------------------
components/gcm_driver/android/BUILD.gn | 1 -
components/gcm_driver/instance_id/android/BUILD.gn | 1 -
.../gcm_driver/instance_id/InstanceIDBridge.java | 49 +----
.../gcm_driver/instance_id/InstanceIDBridge.java | 52 +-----
components/sync/android/BUILD.gn | 1 -
third_party/cacheinvalidation/BUILD.gn | 6 -
.../client/contrib/MultiplexingGcmListener.java | 91 +--------
.../android2/channel/AndroidNetworkChannel.java | 6 +-
19 files changed, 9 insertions(+), 597 deletions(-)
19 files changed, 9 insertions(+), 600 deletions(-)
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
--- a/chrome/android/BUILD.gn
+++ b/chrome/android/BUILD.gn
@@ -378,7 +378,6 @@ android_library("chrome_java") {
@@ -379,7 +379,6 @@ android_library("chrome_java") {
"//third_party/android_deps:com_google_protobuf_protobuf_lite_java",
"//third_party/android_deps:javax_inject_javax_inject_java",
"//third_party/android_media:android_media_java",
@ -38,7 +38,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni
--- a/chrome/android/chrome_java_sources.gni
+++ b/chrome/android/chrome_java_sources.gni
@@ -20,7 +20,6 @@ chrome_java_sources = [
@@ -19,7 +19,6 @@ chrome_java_sources = [
"java/src/org/chromium/chrome/browser/ChromeActivity.java",
"java/src/org/chromium/chrome/browser/ChromeActivitySessionTracker.java",
"java/src/org/chromium/chrome/browser/ChromeApplication.java",
@ -61,7 +61,7 @@ diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java
diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml
--- a/chrome/android/java/AndroidManifest.xml
+++ b/chrome/android/java/AndroidManifest.xml
@@ -78,22 +78,17 @@ by a child template that "extends" this file.
@@ -85,22 +85,17 @@ by a child template that "extends" this file.
<permission android:name="{{ manifest_package }}.permission.CHILD_SERVICE" android:protectionLevel="signature" />
<permission android:name="{{ manifest_package }}.permission.READ_WRITE_BOOKMARK_FOLDERS" android:protectionLevel="signatureOrSystem" />
<permission android:name="{{ manifest_package }}.TOS_ACKED" android:protectionLevel="signatureOrSystem" />
@ -83,8 +83,8 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/Andro
- <uses-permission android:name="com.google.android.c2dm.permission.RECEIVE" />
<uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT"/>
{% block extra_uses_permissions %}
@@ -1068,49 +1063,8 @@ by a child template that "extends" this file.
<uses-permission android:name="com.google.android.apps.now.CURRENT_ACCOUNT_ACCESS" />
@@ -1087,45 +1082,6 @@ by a child template that "extends" this file.
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|mcc|mnc|screenLayout|smallestScreenSize"
android:hardwareAccelerated="false" />
@ -127,6 +127,11 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/Andro
- <service android:name="org.chromium.chrome.browser.services.gcm.InvalidationGcmUpstreamSender"
- android:exported="false"/>
-
<!-- Notification service for sync. -->
<meta-data android:name="ipc.invalidation.ticl.listener_service_class"
android:value="org.chromium.chrome.browser.invalidation.ChromeInvalidationClientService"/>
@@ -1137,8 +1093,6 @@ by a child template that "extends" this file.
</service>
<service android:name="com.google.ipc.invalidation.ticl.android2.TiclService"
android:exported="false"/>
- <service android:name="com.google.ipc.invalidation.ticl.android2.channel.AndroidMessageSenderService"
@ -134,7 +139,7 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/Andro
<receiver android:name="com.google.ipc.invalidation.ticl.android2.AndroidInternalScheduler$AlarmReceiver"
android:exported="false"/>
<receiver android:name="com.google.ipc.invalidation.external.client.contrib.AndroidListener$AlarmReceiver"
@@ -1137,24 +1091,6 @@ by a child template that "extends" this file.
@@ -1165,24 +1119,6 @@ by a child template that "extends" this file.
android:exported="false"
android:permission="android.permission.BIND_JOB_SERVICE"/>
@ -379,10 +384,11 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/snippets/Sn
private boolean mGCMEnabled = true;
/**
@@ -78,7 +71,6 @@ public class SnippetsLauncher {
@@ -78,7 +71,7 @@ public class SnippetsLauncher {
protected SnippetsLauncher() {
checkGCM();
+ mGCMEnabled = false;
- mScheduler = GcmNetworkManager.getInstance(ContextUtils.getApplicationContext());
}
@ -527,7 +533,7 @@ diff --git a/components/background_task_scheduler/android/java/src/org/chromium/
import org.chromium.base.Log;
import org.chromium.base.ThreadUtils;
import org.chromium.base.VisibleForTesting;
@@ -42,212 +34,16 @@ class BackgroundTaskSchedulerGcmNetworkManager implements BackgroundTaskSchedule
@@ -42,212 +34,14 @@ class BackgroundTaskSchedulerGcmNetworkManager implements BackgroundTaskSchedule
sClock = clock;
}
@ -690,7 +696,7 @@ diff --git a/components/background_task_scheduler/android/java/src/org/chromium/
- return Task.NETWORK_STATE_ANY;
- }
-
@Override
- @Override
public boolean schedule(Context context, @NonNull TaskInfo taskInfo) {
ThreadUtils.assertOnUiThread();
@ -714,7 +720,7 @@ diff --git a/components/background_task_scheduler/android/java/src/org/chromium/
+ return false;
}
@Override
- @Override
public void cancel(Context context, int taskId) {
ThreadUtils.assertOnUiThread();
-
@ -792,7 +798,7 @@ diff --git a/components/gcm_driver/instance_id/android/java/src/org/chromium/com
}
@Override
protected void sendResultToNative(Long creationTime) {
@@ -113,21 +112,7 @@ public class InstanceIDBridge {
@@ -113,24 +112,7 @@ public class InstanceIDBridge {
new BridgeAsyncTask<String>() {
@Override
protected String doBackgroundWork() {
@ -807,7 +813,10 @@ diff --git a/components/gcm_driver/instance_id/android/java/src/org/chromium/com
- SubscriptionFlagManager.buildSubscriptionUniqueId(
- mSubtype, authorizedEntity),
- flags);
- return mInstanceID.getToken(authorizedEntity, scope, extras);
- if (mInstanceID != null)
- return mInstanceID.getToken(authorizedEntity, scope, extras);
- else
- return "";
- } catch (IOException ex) {
- return "";
- }
@ -815,7 +824,7 @@ diff --git a/components/gcm_driver/instance_id/android/java/src/org/chromium/com
}
@Override
protected void sendResultToNative(String token) {
@@ -143,21 +128,7 @@ public class InstanceIDBridge {
@@ -146,21 +128,7 @@ public class InstanceIDBridge {
new BridgeAsyncTask<Boolean>() {
@Override
protected Boolean doBackgroundWork() {
@ -838,7 +847,7 @@ diff --git a/components/gcm_driver/instance_id/android/java/src/org/chromium/com
}
@Override
protected void sendResultToNative(Boolean success) {
@@ -172,12 +143,7 @@ public class InstanceIDBridge {
@@ -175,12 +143,7 @@ public class InstanceIDBridge {
new BridgeAsyncTask<Boolean>() {
@Override
protected Boolean doBackgroundWork() {
@ -852,7 +861,7 @@ diff --git a/components/gcm_driver/instance_id/android/java/src/org/chromium/com
}
@Override
protected void sendResultToNative(Boolean success) {
@@ -216,11 +182,6 @@ public class InstanceIDBridge {
@@ -219,11 +182,6 @@ public class InstanceIDBridge {
@Override
@SuppressWarnings("NoSynchronizedThisCheck") // Only used/accessible by native.
protected Result doInBackground() {
@ -922,10 +931,11 @@ diff --git a/third_party/cacheinvalidation/src/java/com/google/ipc/invalidation/
/* This class is public so that it can be instantiated by the Android runtime. */
/** Constants used in broadcast Intents. */
@@ -106,18 +103,6 @@ public class MultiplexingGcmListener extends GCMBaseIntentService {
@@ -105,18 +102,6 @@ public class MultiplexingGcmListener extends GCMBaseIntentService {
public static final String EXTRA_DATA_NUM_DELETED_MSGS = PREFIX + "NUM_DELETED_MSGS";
}
/**
- /**
- * {@link GCMBroadcastReceiver} that forwards GCM intents to the {@code MultiplexingGcmListener}
- * class.
- */
@ -937,10 +947,9 @@ diff --git a/third_party/cacheinvalidation/src/java/com/google/ipc/invalidation/
- }
- }
-
- /**
/**
* Convenience base class for client implementations. It provides base classes for a broadcast
* receiver and an intent service that work together to handle events from the
* {@code MultiplexingGcmListener} while holding a wake lock.
@@ -260,80 +245,6 @@ public class MultiplexingGcmListener extends GCMBaseIntentService {
/** Logger. */
private static final Logger logger = AndroidLogger.forTag("MplexGcmListener");


+ 0
- 11
patches/Unobtainium/kill-TOS-and-metrics-opt-out.patch View File

@ -20,17 +20,6 @@ diff --git a/chrome/android/java/res/layout/fre_tosanduma.xml b/chrome/android/j
<CheckBox
android:id="@+id/send_report_checkbox"
diff --git a/chrome/android/java/res/values/dimens.xml b/chrome/android/java/res/values/dimens.xml
--- a/chrome/android/java/res/values/dimens.xml
+++ b/chrome/android/java/res/values/dimens.xml
@@ -197,7 +197,6 @@
<dimen name="fre_button_padding">12dp</dimen>
<dimen name="fre_margin">24dp</dimen>
<dimen name="fre_image_height">120dp</dimen>
- <dimen name="fre_tos_checkbox_padding">12dp</dimen>
<!-- Account Signin dimensions -->
<!-- The Account Signin page appears in the First Run Experience (amongst other places), so uses
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivityBase.java b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivityBase.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivityBase.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivityBase.java


+ 1
- 1
patches/Vanadium/0021-disable-media-router-by-default.patch View File

@ -40,7 +40,7 @@ diff --git a/src/chrome/browser/media/router/media_router_feature.cc b/src/chrom
diff --git a/src/chrome/browser/profiles/profile_impl.cc b/src/chrome/browser/profiles/profile_impl.cc
--- a/chrome/browser/profiles/profile_impl.cc
+++ b/chrome/browser/profiles/profile_impl.cc
@@ -437,7 +437,7 @@ void ProfileImpl::RegisterProfilePrefs(
@@ -445,7 +445,7 @@ void ProfileImpl::RegisterProfilePrefs(
registry->RegisterStringPref(
prefs::kPrintPreviewDefaultDestinationSelectionRules, std::string());
registry->RegisterBooleanPref(prefs::kForceEphemeralProfiles, false);


+ 6
- 4
patches/android-prune-domain-fix.patch View File

@ -1,9 +1,10 @@
description: remove some prune causing build to fail
description: remove some prune causing build to fail, avoid matching Android namespace declaration/com.google.common package in .java
author: Wengling Chen <[email protected]>
--- a/ungoogled-chromium/pruning.list
+++ b/ungoogled-chromium/pruning.list
@@ -14,7 +14,6 @@ base/test/data/pe_image/pe_image_test_32.dll
@@ -13,7 +13,6 @@ base/test/data/pe_image/pe_image_test_32.dll
base/test/data/pe_image/pe_image_test_64.dll
base/test/data/pe_image/pe_image_test_arm64.dll
build/android/CheckInstallApk-debug.apk
@ -11,7 +12,7 @@ author: Wengling Chen <[email protected]>
build/android/tests/symbolize/liba.so
build/android/tests/symbolize/libb.so
build/linux/sysroot_scripts/debian-archive-sid-stable.gpg
@@ -3582,7 +3581,6 @@ third_party/angle/third_party/glmark2/src/data/models/cat.3ds
@@ -3584,7 +3583,6 @@ third_party/angle/third_party/glmark2/src/data/models/cat.3ds
third_party/angle/third_party/glmark2/src/data/models/cube.3ds
third_party/angle/third_party/glmark2/src/data/models/horse.3ds
third_party/angle/third_party/vulkan-loader/src/loader/loader.aps
@ -19,12 +20,13 @@ author: Wengling Chen <[email protected]>
third_party/blink/manual_tests/WebKitSite.webarchive
third_party/blink/manual_tests/accessibility/resources/AppletTest.class
third_party/blink/manual_tests/plugins/test.swf
@@ -13326,11 +13324,8 @@ third_party/hunspell/fuzz/bdict_corpus/en-US-7-1.bdic
@@ -13335,12 +13333,9 @@ third_party/hunspell/fuzz/bdict_corpus/en-US-7-1.bdic
third_party/hunspell/fuzz/bdict_corpus/en-US-8-0.bdic
third_party/hunspell/fuzz/bdict_corpus/f95048cdc0fc231dd712bad106578a9eeecd869b
third_party/hunspell/fuzz/bdict_corpus/fda69541054125551c41ab3e591e0482405ca2dc
-third_party/icu/android/icudtl.dat
-third_party/icu/android_small/icudtl.dat
third_party/icu/android_small/icudtl_extra.dat
third_party/icu/cast/icudtl.dat
third_party/icu/chromeos/icudtl.dat
-third_party/icu/common/icudtb.dat


+ 1
- 1
patches/series View File

@ -1,6 +1,7 @@
src-fix/android-rlz-fix-missing-variable.patch
src-fix/fix-null-mInstanceID.patch
src-fix/fix-closure-compiler-minify-error.patch
src-fix/fix-unkown-warning-clang-9.patch
Vanadium/0020-disable-media-router-media-remoting-by-default.patch
Vanadium/0021-disable-media-router-by-default.patch
Unobtainium/kill-Auth.patch
@ -20,7 +21,6 @@ ungoogled-chromium-android/Remove-dependency-on-com.google.android.gms.vision-co
ungoogled-chromium-android/Remove-dependency-on-com.google.android.gms.flags-com.google.android.gms.location.places-com.google.android.gms.stats.patch
ungoogled-chromium-android/Remove-dependency-on-com.google.android.gms.common-auth-signin-dynamic-com.google.android.gms.tasks.patch
ungoogled-chromium-android/Remove-dependency-on-com.google.android.play.patch
ungoogled-chromium-android/uncheck-fre-send-report.patch
ungoogled-chromium-android/disable-context-search-by-default.patch
Bromite/Remove-SMS-integration.patch
Bromite/Remove-play-dependency-for-module-installer.patch

+ 27
- 46
patches/src-fix/fix-closure-compiler-minify-error.patch View File

@ -5,35 +5,34 @@ author: Wengling Chen <[email protected]>
ui/webui/resources/js/assert.js | 6 +--
.../resources/js/cr/ui/focus_outline_manager.js | 2 +-
ui/webui/resources/js/i18n_behavior.js | 5 +--
ui/webui/resources/js/load_time_data.js | 7 +--
ui/webui/resources/js/load_time_data.js | 7 +---
ui/webui/resources/js/parse_html_subset.js | 2 +-
ui/webui/resources/js/promise_resolver.js | 4 +-
ui/webui/resources/js/util.js | 52 ++++++++++------------
ui/webui/resources/js/util.js | 48 ++++++++++------------
ui/webui/resources/js/web_ui_listener_behavior.js | 4 +-
8 files changed, 34 insertions(+), 48 deletions(-)
8 files changed, 32 insertions(+), 46 deletions(-)
diff --git a/ui/webui/resources/js/assert.js b/ui/webui/resources/js/assert.js
--- a/ui/webui/resources/js/assert.js
+++ b/ui/webui/resources/js/assert.js
@@ -15,7 +15,7 @@
* @param {string=} opt_message A message to show on failure.
@@ -16,7 +16,7 @@
* @return {T} A non-null |condition|.
* @closurePrimitive {asserts.truthy}
*/
-/* #export */ function assert(condition, opt_message) {
+function assert(condition, opt_message) {
if (!condition) {
let message = 'Assertion failed';
if (opt_message) {
@@ -57,7 +57,7 @@
*
@@ -59,7 +59,7 @@
* @param {string=} opt_message A message to show when this is hit.
* @closurePrimitive {asserts.fail}
*/
-/* #export */ function assertNotReached(opt_message) {
+function assertNotReached(opt_message) {
assert(false, opt_message || 'Unreachable code hit');
}
@@ -68,7 +68,7 @@
@@ -70,7 +70,7 @@
* @return {T}
* @template T
*/
@ -45,7 +44,7 @@ diff --git a/ui/webui/resources/js/assert.js b/ui/webui/resources/js/assert.js
diff --git a/ui/webui/resources/js/cr/ui/focus_outline_manager.js b/ui/webui/resources/js/cr/ui/focus_outline_manager.js
--- a/ui/webui/resources/js/cr/ui/focus_outline_manager.js
+++ b/ui/webui/resources/js/cr/ui/focus_outline_manager.js
@@ -27,7 +27,7 @@ cr.define('cr.ui', function() {
@@ -26,7 +26,7 @@ cr.define('cr.ui', function() {
* it.
*
*/
@ -178,24 +177,6 @@ diff --git a/ui/webui/resources/js/util.js b/ui/webui/resources/js/util.js
element.setAttribute('aria-live', 'polite');
element.style.position = 'fixed';
@@ -74,7 +70,7 @@
* @param {Location} location The URL to generate the CSS url for.
* @return {Object} Dictionary containing name value pairs for URL
*/
-/* #export */ function parseQueryParams(location) {
+function parseQueryParams(location) {
const params = {};
const query = unescape(location.search.substring(1));
const vars = query.split('&');
@@ -93,7 +89,7 @@
* @param {string} value The query parameter value.
* @return {string} The constructed new URL.
*/
-/* #export */ function setQueryParam(location, key, value) {
+function setQueryParam(location, key, value) {
const query = parseQueryParams(location);
query[encodeURIComponent(key)] = encodeURIComponent(value);
@@ -110,7 +106,7 @@
* @param {string} className A class to search for.
* @return {Element} A node with class of |className| or null if none is found.
*/
@ -204,7 +185,7 @@ diff --git a/ui/webui/resources/js/util.js b/ui/webui/resources/js/util.js
return /** @type {Element} */ (findAncestor(el, function(el) {
return el.classList && el.classList.contains(className);
}));
@@ -123,7 +119,7 @@
@@ -87,7 +83,7 @@
* nodes.
* @return {Node} The found ancestor or null if not found.
*/
@ -213,7 +194,7 @@ diff --git a/ui/webui/resources/js/util.js b/ui/webui/resources/js/util.js
let last = false;
while (node != null && !(last = predicate(node))) {
node = node.parentNode;
@@ -139,7 +135,7 @@
@@ -103,7 +99,7 @@
* @param {function(Event):boolean=} opt_allowDragStart Unless this function
* is defined and returns true, the ondragstart event will be surpressed.
*/
@ -222,7 +203,7 @@ diff --git a/ui/webui/resources/js/util.js b/ui/webui/resources/js/util.js
opt_allowSelectStart, opt_allowDragStart) {
// Disable text selection.
document.onselectstart = function(e) {
@@ -160,7 +156,7 @@
@@ -124,7 +120,7 @@
* Check the directionality of the page.
* @return {boolean} True if Chrome is running an RTL UI.
*/
@ -231,7 +212,7 @@ diff --git a/ui/webui/resources/js/util.js b/ui/webui/resources/js/util.js
return document.documentElement.dir == 'rtl';
}
@@ -171,7 +167,7 @@
@@ -135,7 +131,7 @@
* @param {string} id The identifier name.
* @return {!HTMLElement} the Element.
*/
@ -240,7 +221,7 @@ diff --git a/ui/webui/resources/js/util.js b/ui/webui/resources/js/util.js
return assertInstanceof(
$(id), HTMLElement, 'Missing required element: ' + id);
}
@@ -185,7 +181,7 @@
@@ -149,7 +145,7 @@
* context object for querySelector.
* @return {!HTMLElement} the Element.
*/
@ -249,7 +230,7 @@ diff --git a/ui/webui/resources/js/util.js b/ui/webui/resources/js/util.js
const element = (opt_context || document).querySelector(selectors);
return assertInstanceof(
element, HTMLElement, 'Missing required element: ' + selectors);
@@ -248,7 +244,7 @@
@@ -212,7 +208,7 @@
* @param {string} value The value of the param.
* @return {string} The new URL.
*/
@ -258,7 +239,7 @@ diff --git a/ui/webui/resources/js/util.js b/ui/webui/resources/js/util.js
const param = encodeURIComponent(key) + '=' + encodeURIComponent(value);
if (url.indexOf('?') == -1) {
@@ -263,7 +259,7 @@
@@ -227,7 +223,7 @@
* @param {string} className The class name to use.
* @return {Element} The created element.
*/
@ -267,7 +248,7 @@ diff --git a/ui/webui/resources/js/util.js b/ui/webui/resources/js/util.js
const elm = document.createElement(type);
elm.className = className;
return elm;
@@ -278,7 +274,7 @@
@@ -242,7 +238,7 @@
* transitionend to happen. If not specified, it is fetched from |el|
* using the transitionDuration style value.
*/
@ -276,7 +257,7 @@ diff --git a/ui/webui/resources/js/util.js b/ui/webui/resources/js/util.js
if (opt_timeOut === undefined) {
const style = getComputedStyle(el);
opt_timeOut = parseFloat(style.transitionDuration) * 1000;
@@ -305,7 +301,7 @@
@@ -269,7 +265,7 @@
* queried from.
* @return {number} The Y document scroll offset.
*/
@ -285,7 +266,7 @@ diff --git a/ui/webui/resources/js/util.js b/ui/webui/resources/js/util.js
return doc.documentElement.scrollTop || doc.body.scrollTop;
}
@@ -315,7 +311,7 @@
@@ -279,7 +275,7 @@
* queried from.
* @param {number} value The target Y scroll offset.
*/
@ -294,7 +275,7 @@ diff --git a/ui/webui/resources/js/util.js b/ui/webui/resources/js/util.js
doc.documentElement.scrollTop = doc.body.scrollTop = value;
}
@@ -325,7 +321,7 @@
@@ -289,7 +285,7 @@
* queried from.
* @return {number} The X document scroll offset.
*/
@ -303,7 +284,7 @@ diff --git a/ui/webui/resources/js/util.js b/ui/webui/resources/js/util.js
return doc.documentElement.scrollLeft || doc.body.scrollLeft;
}
@@ -335,7 +331,7 @@
@@ -299,7 +295,7 @@
* queried from.
* @param {number} value The target X scroll offset.
*/
@ -312,7 +293,7 @@ diff --git a/ui/webui/resources/js/util.js b/ui/webui/resources/js/util.js
doc.documentElement.scrollLeft = doc.body.scrollLeft = value;
}
@@ -344,7 +340,7 @@
@@ -308,7 +304,7 @@
* @param {string} original The original string.
* @return {string} The string with all the characters mentioned above replaced.
*/
@ -321,7 +302,7 @@ diff --git a/ui/webui/resources/js/util.js b/ui/webui/resources/js/util.js
return original.replace(/&/g, '&amp;')
.replace(/</g, '&lt;')
.replace(/>/g, '&gt;')
@@ -361,7 +357,7 @@
@@ -325,7 +321,7 @@
* |maxLength|. Otherwise the first |maxLength| - 1 characters with '...'
* appended.
*/
@ -330,7 +311,7 @@ diff --git a/ui/webui/resources/js/util.js b/ui/webui/resources/js/util.js
if (original.length <= maxLength) {
return original;
}
@@ -373,7 +369,7 @@
@@ -337,7 +333,7 @@
* @param {string} str The source string.
* @return {string} The escaped string.
*/
@ -339,7 +320,7 @@ diff --git a/ui/webui/resources/js/util.js b/ui/webui/resources/js/util.js
return str.replace(/([\\\.\+\*\?\[\^\]\$\(\)\{\}\=\!\<\>\|\:])/g, '\\$1');
}
@@ -386,7 +382,7 @@
@@ -350,7 +346,7 @@
* @param {function(!Event)} callback Called at most once. The
* optional return value is passed on by the listener.
*/
@ -348,7 +329,7 @@ diff --git a/ui/webui/resources/js/util.js b/ui/webui/resources/js/util.js
if (!Array.isArray(eventNames)) {
eventNames = eventNames.split(/ +/);
}
@@ -511,7 +507,7 @@ if (!('key' in KeyboardEvent.prototype)) {
@@ -475,7 +471,7 @@ if (!('key' in KeyboardEvent.prototype)) {
* @param {!Event} e
* @return {boolean} Whether a modifier key was down when processing |e|.
*/
@ -364,7 +345,7 @@ diff --git a/ui/webui/resources/js/web_ui_listener_behavior.js b/ui/webui/resour
* automatically remove WebUI listeners when detached.
*/
-// #import {addWebUIListener, removeWebUIListener} from './cr.m.js';
-// #import {WebUIListener, addWebUIListener, removeWebUIListener} from './cr.m.js';
-
/** @polymerBehavior */
// eslint-disable-next-line no-var


+ 3
- 3
patches/src-fix/fix-null-mInstanceID.patch View File

@ -1,10 +1,10 @@
diff --git a/components/gcm_driver/instance_id/android/java/src/org/chromium/components/gcm_driver/instance_id/InstanceIDBridge.java b/components/gcm_driver/instance_id/android/java/src/org/chromium/components/gcm_driver/instance_id/InstanceIDBridge.java
--- a/components/gcm_driver/instance_id/android/java/src/org/chromium/components/gcm_driver/instance_id/InstanceIDBridge.java
+++ b/components/gcm_driver/instance_id/android/java/src/org/chromium/components/gcm_driver/instance_id/InstanceIDBridge.java
@@ -116,7 +116,10 @@ public class InstanceIDBridge {
LazySubscriptionsManager.buildSubscriptionUniqueId(
@@ -124,7 +124,10 @@ public class InstanceIDBridge {
SubscriptionFlagManager.buildSubscriptionUniqueId(
mSubtype, authorizedEntity),
isLazy);
flags);
- return mInstanceID.getToken(authorizedEntity, scope, extras);
+ if (mInstanceID != null)
+ return mInstanceID.getToken(authorizedEntity, scope, extras);


+ 20
- 0
patches/src-fix/fix-unkown-warning-clang-9.patch View File

@ -0,0 +1,20 @@
description: prevent clang 9 from printing unknown-warning warning
author: Wengling Chen <[email protected]>
---
build/config/compiler/BUILD.gn | 3 +++
1 files changed, 3 insertions(+)
diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
--- a/build/config/compiler/BUILD.gn
+++ b/build/config/compiler/BUILD.gn
@@ -1497,6 +1497,9 @@ config("default_warnings") {
# Flags NaCl (Clang 3.7) and Xcode 9.2 (Clang clang-900.0.39.2) do not
# recognize.
cflags += [
+ # Ignore unknown warning warnings from clang 9
+ "-Wno-unknown-warning-option",
+
# Ignore warnings about MSVC optimization pragmas.
# TODO(thakis): Only for no_chromium_code? http://crbug.com/912662
"-Wno-ignored-pragma-optimize",

+ 1
- 1
patches/ungoogled-chromium-android/Remove-dependency-on-com.google.android.gcm.patch View File

@ -60,7 +60,7 @@ diff --git a/third_party/cacheinvalidation/src/java/com/google/ipc/invalidation/
- <!-- GCM multiplexer -->
- <service android:exported="false"
- android:name="com.google.ipc.invalidation.external.client.contrib.MultiplexingGcmListener">
- <meta-data android:name="sender_ids" android:value="[email protected]gmail.com"/>
- <meta-data android:name="sender_ids" android:value="[email protected]9ma1l.qjz9zk"/>
- </service>
-
- <!-- Invalidation service multiplexed GCM receiver -->


+ 28
- 28
patches/ungoogled-chromium-android/Remove-dependency-on-com.google.android.gms.cast.patch View File

@ -35,27 +35,27 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
"$google_play_services_package:google_play_services_basement_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",
"$google_play_services_package:google_play_services_iid_java",
"$google_play_services_package:google_play_services_tasks_java",
"//base:base_java",
"//base:jni_java",
@@ -689,8 +687,6 @@ junit_binary("chrome_junit_tests") {
@@ -692,8 +690,6 @@ junit_binary("chrome_junit_tests") {
":partner_location_descriptor_proto_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",
- "$google_play_services_package:google_play_services_cast_java",
"$google_play_services_package:google_play_services_fido_java",
"//base:base_java",
"//base:base_java_test_support",
"//base:base_junit_test_support",
@@ -790,8 +786,6 @@ android_library("chrome_test_java") {
@@ -794,8 +790,6 @@ android_library("chrome_test_java") {
":partner_location_descriptor_proto_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",
- "$google_play_services_package:google_play_services_cast_java",
"$google_play_services_package:google_play_services_fido_java",
"$google_play_services_package:google_play_services_iid_java",
"$google_play_services_package:google_play_services_tasks_java",
"//base:base_java",
"//base:base_java_test_support",
diff --git a/chrome/android/features/media_router/BUILD.gn b/chrome/android/features/media_router/BUILD.gn
--- a/chrome/android/features/media_router/BUILD.gn
+++ b/chrome/android/features/media_router/BUILD.gn
@ -772,10 +772,11 @@ diff --git a/chrome/android/features/media_router/java/src/org/chromium/chrome/b
import org.chromium.base.Log;
import org.chromium.chrome.browser.media.router.ChromeMediaRouter;
import org.chromium.chrome.browser.media.router.ClientRecord;
@@ -148,20 +146,6 @@ public class CafMediaRouteProvider extends CafBaseMediaRouteProvider {
@@ -147,20 +145,6 @@ public class CafMediaRouteProvider extends CafBaseMediaRouteProvider {
return mMessageHandler;
}
@Override
- @Override
- protected void handleSessionStart(CastSession session, String sessionId) {
- super.handleSessionStart(session, sessionId);
-
@ -789,10 +790,9 @@ diff --git a/chrome/android/features/media_router/java/src/org/chromium/chrome/b
- sessionController().getSession().getRemoteMediaClient().requestStatus();
- }
-
- @Override
@Override
protected void addRoute(
MediaRoute route, String origin, int tabId, int nativeRequestId, boolean wasLaunched) {
super.addRoute(route, origin, tabId, nativeRequestId, wasLaunched);
diff --git a/chrome/android/features/media_router/java/src/org/chromium/chrome/browser/media/router/caf/CafMessageHandler.java b/chrome/android/features/media_router/java/src/org/chromium/chrome/browser/media/router/caf/CafMessageHandler.java
--- a/chrome/android/features/media_router/java/src/org/chromium/chrome/browser/media/router/caf/CafMessageHandler.java
+++ b/chrome/android/features/media_router/java/src/org/chromium/chrome/browser/media/router/caf/CafMessageHandler.java
@ -1380,10 +1380,11 @@ diff --git a/chrome/android/features/media_router/java/src/org/chromium/chrome/b
import org.chromium.base.Log;
import org.chromium.chrome.browser.media.router.CastSessionUtil;
import org.chromium.chrome.browser.media.router.caf.BaseNotificationController;
@@ -34,19 +32,6 @@ public class RemotingSessionController extends BaseSessionController {
@@ -33,19 +31,6 @@ public class RemotingSessionController extends BaseSessionController {
sInstance = new WeakReference<>(this);
}
@Override
- @Override
- public void attachToCastSession(CastSession session) {
- super.attachToCastSession(session);
-
@ -1396,27 +1397,26 @@ diff --git a/chrome/android/features/media_router/java/src/org/chromium/chrome/b
- }
- }
-
- @Override
@Override
public void onSessionStarted() {
super.onSessionStarted();
RemotingMediaSource source = (RemotingMediaSource) getSource();
@@ -54,12 +39,6 @@ public class RemotingSessionController extends BaseSessionController {
@@ -53,12 +38,6 @@ public class RemotingSessionController extends BaseSessionController {
mFlingingControllerAdapter = new FlingingControllerAdapter(this, source.getMediaUrl());
}
@Override
- @Override
- protected void onStatusUpdated() {
- mFlingingControllerAdapter.onStatusUpdated();
- super.onStatusUpdated();
- }
-
- @Override
@Override
public FlingingControllerAdapter getFlingingController() {
return mFlingingControllerAdapter;
}
diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml
--- a/chrome/android/java/AndroidManifest.xml
+++ b/chrome/android/java/AndroidManifest.xml
@@ -184,12 +184,6 @@ by a child template that "extends" this file.
@@ -193,12 +193,6 @@ by a child template that "extends" this file.
android:theme="@android:style/Theme.Material.Light.Dialog.Alert" />
{% endif %}
@ -1429,7 +1429,7 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/Andro
<!-- Note: All activities directly or indirectly derived from ChromeActivity
must specify android:hardwareAccelerated="false".
@@ -832,16 +826,6 @@ by a child template that "extends" this file.
@@ -841,16 +835,6 @@ by a child template that "extends" this file.
</intent-filter>
</activity>
@ -1446,7 +1446,7 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/Andro
<!-- This activity is used to restart the main Chrome process. Should never be exported. -->
<activity android:name="org.chromium.chrome.browser.BrowserRestartActivity"
android:launchMode="singleInstance"
@@ -1253,18 +1237,6 @@ android:value="true" />
@@ -1281,18 +1265,6 @@ android:value="true" />
{% endif %}
{% block extra_application_definitions %}
@ -1479,10 +1479,11 @@ diff --git a/chrome/test/android/cast_emulator/BUILD.gn b/chrome/test/android/ca
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
@@ -798,38 +798,6 @@ android_aar_prebuilt("google_play_services_basement_java") {
@@ -797,38 +797,6 @@ android_aar_prebuilt("google_play_services_basement_java") {
input_jars_paths = [ "$android_sdk/optional/org.apache.http.legacy.jar" ]
}
# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
-# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
-android_aar_prebuilt("google_play_services_cast_java") {
- aar_path = "libs/com_google_android_gms_play_services_cast/play-services-cast-16.0.1.aar"
- info_path = "libs/com_google_android_gms_play_services_cast/com_google_android_gms_play_services_cast.info"
@ -1514,10 +1515,9 @@ diff --git a/third_party/android_deps/BUILD.gn b/third_party/android_deps/BUILD.
- strip_resources = true
-}
-
-# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
android_aar_prebuilt("google_play_services_tasks_java") {
aar_path = "libs/com_google_android_gms_play_services_tasks/play-services-tasks-15.0.1.aar"
info_path = "libs/com_google_android_gms_play_services_tasks/com_google_android_gms_play_services_tasks.info"
# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
android_aar_prebuilt("google_play_services_fido_java") {
aar_path = "libs/com_google_android_gms_play_services_fido/play-services-fido-15.0.1.aar"
--
2.11.0

+ 54
- 15
patches/ungoogled-chromium-android/Remove-dependency-on-com.google.android.gms.common-auth-signin-dynamic-com.google.android.gms.tasks.patch View File

@ -21,9 +21,11 @@ Subject: Remove dependency on
chrome/test/android/BUILD.gn | 2 -
components/background_task_scheduler/BUILD.gn | 10 ---
components/signin/core/browser/android/BUILD.gn | 2 -
.../components/signin/AccountIdProvider.java | 3 -
.../signin/GmsAvailabilityException.java | 4 +-
.../signin/SystemAccountManagerDelegate.java | 3 -
content/public/android/BUILD.gn | 3 -
content/test/BUILD.gn | 3 -
content/test/BUILD.gn | 4 --
device/BUILD.gn | 2 -
remoting/android/client_java_tmpl.gni | 3 -
services/BUILD.gn | 4 --
@ -32,8 +34,7 @@ Subject: Remove dependency on
third_party/android_deps/BUILD.gn | 38 ----------
third_party/cacheinvalidation/BUILD.gn | 1 -
third_party/robolectric/BUILD.gn | 2 -
27 files changed, 16 insertions(+), 260 deletions(-)
29 files changed, 16 insertions(+), 267 deletions(-)
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
--- a/chrome/android/BUILD.gn
+++ b/chrome/android/BUILD.gn
@ -47,7 +48,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
"//base:base_java",
"//base:jni_java",
"//chrome/android/features/keyboard_accessory:public_java",
@@ -685,8 +682,6 @@ junit_binary("chrome_junit_tests") {
@@ -686,8 +683,6 @@ junit_binary("chrome_junit_tests") {
":chrome_java",
":chrome_junit_test_support",
":partner_location_descriptor_proto_java",
@ -56,7 +57,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
"//base:base_java",
"//base:base_java_test_support",
"//base:base_junit_test_support",
@@ -784,9 +779,6 @@ android_library("chrome_test_java") {
@@ -785,9 +780,6 @@ android_library("chrome_test_java") {
":browser_java_test_support",
":chrome_test_util_java",
":partner_location_descriptor_proto_java",
@ -105,7 +106,7 @@ diff --git a/chrome/android/features/media_router/java/src/org/chromium/chrome/b
diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml
--- a/chrome/android/java/AndroidManifest.xml
+++ b/chrome/android/java/AndroidManifest.xml
@@ -889,15 +889,6 @@ by a child template that "extends" this file.
@@ -898,15 +898,6 @@ by a child template that "extends" this file.
</intent-filter>
</activity>
@ -200,6 +201,18 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/component_updat
import org.chromium.base.ContextUtils;
import org.chromium.base.annotations.CalledByNative;
import org.chromium.base.annotations.JNINamespace;
@@ -36,10 +33,7 @@
@CalledByNative
/* package */ static boolean isAvailable() {
- return Build.VERSION.SDK_INT >= Build.VERSION_CODES.M
- || GoogleApiAvailability.getInstance().isGooglePlayServicesAvailable(
- ContextUtils.getApplicationContext())
- == ConnectionResult.SUCCESS;
+ return false;
}
/* package */ void onStartTaskBeforeNativeLoaded(TaskFinishedCallback callback) {
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/externalauth/ExternalAuthUtils.java b/chrome/android/java/src/org/chromium/chrome/browser/externalauth/ExternalAuthUtils.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/externalauth/ExternalAuthUtils.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/externalauth/ExternalAuthUtils.java
@ -373,7 +386,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/gcore/GoogleApi
import org.chromium.base.ApplicationStatus;
import org.chromium.base.ApplicationStatus.ApplicationStateListener;
import org.chromium.base.Log;
@@ -67,30 +62,16 @@ import org.chromium.base.ThreadUtils;
@@ -67,29 +62,15 @@ import org.chromium.base.ThreadUtils;
* }
* </pre>
*/
@ -389,7 +402,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/gcore/GoogleApi
private long mDisconnectionDelayMs;
private Runnable mPendingDisconnect;
/**
- /**
- * Creates a helper and enrolls it in the various connection management features.
- * See the class documentation for {@link GoogleApiClientHelper} for more information.
- *
@ -401,10 +414,9 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/gcore/GoogleApi
- enableLifecycleManagement(true);
- }
-
- /**
/**
* Opts in or out of lifecycle management. The client's connection will be closed and reopened
* when Chrome goes in and out of background.
*
@@ -116,13 +97,6 @@ public class GoogleApiClientHelper
* Enabling or disabling it while it is already enabled or disabled has no effect.
*/
@ -606,6 +618,19 @@ diff --git a/components/signin/core/browser/android/BUILD.gn b/components/signin
"//base:base_java",
"//base:jni_java",
"//net/android:net_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
@@ -4,9 +4,6 @@
package org.chromium.components.signin;
-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;
diff --git a/components/signin/core/browser/android/java/src/org/chromium/components/signin/GmsAvailabilityException.java b/components/signin/core/browser/android/java/src/org/chromium/components/signin/GmsAvailabilityException.java
--- a/components/signin/core/browser/android/java/src/org/chromium/components/signin/GmsAvailabilityException.java
+++ b/components/signin/core/browser/android/java/src/org/chromium/components/signin/GmsAvailabilityException.java
@ -626,6 +651,19 @@ diff --git a/components/signin/core/browser/android/java/src/org/chromium/compon
+ 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;
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
@ -642,10 +680,11 @@ diff --git a/content/public/android/BUILD.gn b/content/public/android/BUILD.gn
diff --git a/content/test/BUILD.gn b/content/test/BUILD.gn
--- a/content/test/BUILD.gn
+++ b/content/test/BUILD.gn
@@ -2442,9 +2442,6 @@ if (is_android) {
@@ -2436,10 +2436,6 @@ if (is_android) {
testonly = true
java_files = 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",
@ -725,10 +764,11 @@ diff --git a/services/shape_detection/BUILD.gn b/services/shape_detection/BUILD.
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
@@ -772,44 +772,6 @@ android_aar_prebuilt("com_android_support_viewpager_java") {
@@ -771,44 +771,6 @@ android_aar_prebuilt("com_android_support_viewpager_java") {
]
}
# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
-# 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"
- info_path = "libs/com_google_android_gms_play_services_base/com_google_android_gms_play_services_base.info"
@ -766,10 +806,9 @@ diff --git a/third_party/android_deps/BUILD.gn b/third_party/android_deps/BUILD.
- strip_drawables = true
-}
-
-# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
android_aar_prebuilt("com_google_android_material_material_java") {
aar_path = "libs/com_google_android_material_material/material-1.0.0-rc02.aar"
info_path = "libs/com_google_android_material_material/com_google_android_material_material.info"
diff --git a/third_party/cacheinvalidation/BUILD.gn b/third_party/cacheinvalidation/BUILD.gn
--- a/third_party/cacheinvalidation/BUILD.gn
+++ b/third_party/cacheinvalidation/BUILD.gn


+ 15
- 15
patches/ungoogled-chromium-android/Remove-dependency-on-com.google.android.gms.fido-com.google.android.gms.iid-com.google.android.gms.instantapps-com.google.android.gms.location.patch View File

@ -21,27 +21,27 @@ Subject: Remove dependency on com.google.android.gms.fido,
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
--- a/chrome/android/BUILD.gn
+++ b/chrome/android/BUILD.gn
@@ -271,8 +271,6 @@ android_library("chrome_java") {
@@ -269,8 +269,6 @@ android_library("chrome_java") {
":usage_stats_proto_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",
"$google_play_services_package:google_play_services_cast_java",
- "$google_play_services_package:google_play_services_fido_java",
- "$google_play_services_package:google_play_services_iid_java",
"$google_play_services_package:google_play_services_tasks_java",
"//base:base_java",
"//base:jni_java",
@@ -693,7 +691,6 @@ junit_binary("chrome_junit_tests") {
@@ -690,7 +688,6 @@ junit_binary("chrome_junit_tests") {
":partner_location_descriptor_proto_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",
"$google_play_services_package:google_play_services_cast_java",
- "$google_play_services_package:google_play_services_fido_java",
"//base:base_java",
"//base:base_java_test_support",
"//base:base_junit_test_support",
@@ -795,8 +792,6 @@ android_library("chrome_test_java") {
@@ -790,8 +787,6 @@ android_library("chrome_test_java") {
":partner_location_descriptor_proto_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",
"$google_play_services_package:google_play_services_cast_java",
- "$google_play_services_package:google_play_services_fido_java",
- "$google_play_services_package:google_play_services_iid_java",
"$google_play_services_package:google_play_services_tasks_java",
@ -50,7 +50,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/externalnav/ExternalNavigationHandler.java b/chrome/android/java/src/org/chromium/chrome/browser/externalnav/ExternalNavigationHandler.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/externalnav/ExternalNavigationHandler.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/externalnav/ExternalNavigationHandler.java
@@ -581,7 +581,6 @@ public class ExternalNavigationHandler {
@@ -574,7 +574,6 @@ public class ExternalNavigationHandler {
if (shouldProxyForInstantApps) {
RecordHistogram.recordEnumeratedHistogram("Android.InstantApps.DirectInstantAppsIntent",
AiaIntent.SERP, AiaIntent.NUM_ENTRIES);
@ -58,7 +58,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/externalnav/Ext
} else if (isDirectInstantAppsIntent) {
// For security reasons, we disable all intent:// URLs to Instant Apps that are
// not coming from SERP.
@@ -590,8 +589,6 @@ public class ExternalNavigationHandler {
@@ -583,8 +582,6 @@ public class ExternalNavigationHandler {
AiaIntent.OTHER, AiaIntent.NUM_ENTRIES);
return OverrideUrlLoadingResult.NO_OVERRIDE;
} else {
@ -460,10 +460,11 @@ diff --git a/services/device/geolocation/android/java/src/org/chromium/device/ge
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
@@ -830,64 +830,6 @@ android_aar_prebuilt("google_play_services_cast_framework_java") {
@@ -797,64 +797,6 @@ android_aar_prebuilt("google_play_services_basement_java") {
input_jars_paths = [ "$android_sdk/optional/org.apache.http.legacy.jar" ]
}
# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
-# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
-android_aar_prebuilt("google_play_services_fido_java") {
- aar_path = "libs/com_google_android_gms_play_services_fido/play-services-fido-15.0.1.aar"
- info_path = "libs/com_google_android_gms_play_services_fido/com_google_android_gms_play_services_fido.info"
@ -521,10 +522,9 @@ diff --git a/third_party/android_deps/BUILD.gn b/third_party/android_deps/BUILD.
- strip_drawables = true
-}
-
-# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
android_aar_prebuilt("google_play_services_tasks_java") {
aar_path = "libs/com_google_android_gms_play_services_tasks/play-services-tasks-15.0.1.aar"
info_path = "libs/com_google_android_gms_play_services_tasks/com_google_android_gms_play_services_tasks.info"
diff --git a/third_party/cacheinvalidation/BUILD.gn b/third_party/cacheinvalidation/BUILD.gn
--- a/third_party/cacheinvalidation/BUILD.gn
+++ b/third_party/cacheinvalidation/BUILD.gn


+ 4
- 4
patches/ungoogled-chromium-android/Remove-dependency-on-com.google.android.gms.flags-com.google.android.gms.location.places-com.google.android.gms.stats.patch View File

@ -10,10 +10,11 @@ Subject: Remove dependency on com.google.android.gms.flags,
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
@@ -1499,55 +1499,6 @@ android_aar_prebuilt("com_android_support_versionedparcelable_java") {
@@ -1408,55 +1408,6 @@ android_aar_prebuilt("com_android_support_versionedparcelable_java") {
ignore_aidl = true
}
# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
-# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
-android_aar_prebuilt("google_play_services_flags_java") {
- aar_path = "libs/com_google_android_gms_play_services_flags/play-services-flags-15.0.1.aar"
- info_path = "libs/com_google_android_gms_play_services_flags/com_google_android_gms_play_services_flags.info"
@ -62,10 +63,9 @@ diff --git a/third_party/android_deps/BUILD.gn b/third_party/android_deps/BUILD.
- strip_drawables = true
-}
-
-# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
java_prebuilt("com_google_code_findbugs_jsr305_java") {
jar_path = "libs/com_google_code_findbugs_jsr305/jsr305-1.3.9.jar"
output_name = "com_google_code_findbugs_jsr305"
--
2.11.0

+ 14
- 23
patches/ungoogled-chromium-android/Remove-dependency-on-com.google.android.gms.gcm.patch View File

@ -26,7 +26,7 @@ The snippets are already disabled in native codes, this will disable it on Java
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
--- a/chrome/android/BUILD.gn
+++ b/chrome/android/BUILD.gn
@@ -272,7 +272,6 @@ android_library("chrome_java") {
@@ -273,7 +273,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",
@ -34,7 +34,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",
@@ -798,7 +797,6 @@ android_library("chrome_test_java") {
@@ -799,7 +798,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",
@ -42,7 +42,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",
@@ -1543,7 +1541,6 @@ android_library("browser_java_test_support") {
@@ -1546,7 +1544,6 @@ android_library("browser_java_test_support") {
]
deps = [
":chrome_java",
@ -214,14 +214,6 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/snippets/Sn
/**
* Create a SnippetsLauncher object, which is owned by C++.
@@ -43,6 +43,7 @@ public class SnippetsLauncher {
@VisibleForTesting
@CalledByNative
public static SnippetsLauncher create() {
+ mGCMEnabled = false;
if (sInstance != null) {
throw new IllegalStateException("Already instantiated");
}
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/services/gcm/ChromeGcmListenerService.java b/chrome/android/java/src/org/chromium/chrome/browser/services/gcm/ChromeGcmListenerService.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/services/gcm/ChromeGcmListenerService.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/services/gcm/ChromeGcmListenerService.java
@ -356,10 +348,11 @@ diff --git a/components/background_task_scheduler/android/java/src/org/chromium/
private static final String TAG = "BkgrdTaskGcmTS";
private BackgroundTaskSchedulerGcmNetworkManager.Clock mClock = System::currentTimeMillis;
@@ -90,63 +86,6 @@ public class BackgroundTaskGcmTaskService extends GcmTaskService {
@@ -89,63 +85,6 @@ public class BackgroundTaskGcmTaskService extends GcmTaskService {
}
}
@Override
- @Override
- public int onRunTask(TaskParams params) {
- final TaskParameters taskParams =
- BackgroundTaskSchedulerGcmNetworkManager.getTaskParametersFromTaskParams(params);
@ -416,10 +409,9 @@ diff --git a/components/background_task_scheduler/android/java/src/org/chromium/
- return GcmNetworkManager.RESULT_SUCCESS;
- }
-
- @Override
@Override
public void onInitializeTasks() {
// Ignore the event on OSs supporting JobScheduler.
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) return;
diff --git a/components/background_task_scheduler/android/java/src/org/chromium/components/background_task_scheduler/BackgroundTaskSchedulerFactory.java b/components/background_task_scheduler/android/java/src/org/chromium/components/background_task_scheduler/BackgroundTaskSchedulerFactory.java
--- a/components/background_task_scheduler/android/java/src/org/chromium/components/background_task_scheduler/BackgroundTaskSchedulerFactory.java
+++ b/components/background_task_scheduler/android/java/src/org/chromium/components/background_task_scheduler/BackgroundTaskSchedulerFactory.java
@ -451,10 +443,11 @@ diff --git a/components/background_task_scheduler/android/java/src/org/chromium/
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
@@ -844,21 +844,6 @@ android_aar_prebuilt("google_play_services_fido_java") {
@@ -887,21 +887,6 @@ android_aar_prebuilt("google_play_services_fido_java") {
strip_drawables = true
}
# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
-# 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-15.0.1.aar"
- info_path = "libs/com_google_android_gms_play_services_gcm/com_google_android_gms_play_services_gcm.info"
@ -469,10 +462,9 @@ diff --git a/third_party/android_deps/BUILD.gn b/third_party/android_deps/BUILD.
- strip_drawables = true
-}
-
-# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
android_aar_prebuilt("google_play_services_iid_java") {
aar_path = "libs/com_google_android_gms_play_services_iid/play-services-iid-15.0.1.aar"
info_path = "libs/com_google_android_gms_play_services_iid/com_google_android_gms_play_services_iid.info"
diff --git a/third_party/cacheinvalidation/BUILD.gn b/third_party/cacheinvalidation/BUILD.gn
--- a/third_party/cacheinvalidation/BUILD.gn
+++ b/third_party/cacheinvalidation/BUILD.gn
@ -541,7 +533,7 @@ diff --git a/third_party/cacheinvalidation/src/java/com/google/ipc/invalidation/
private Context context;
@@ -64,33 +62,13 @@ public class AndroidGcmController {
@@ -64,32 +62,12 @@ public class AndroidGcmController {
public static AndroidGcmController get(Context context) {
synchronized (lock) {
if (androidGcmController == null) {
@ -553,7 +545,7 @@ diff --git a/third_party/cacheinvalidation/src/java/com/google/ipc/invalidation/
return androidGcmController;
}
/**
- /**
- * Override AndroidGcmController with a custom GcmNetworkManager in tests. This overrides the
- * existing instance of AndroidGcmController if any.
- *
@ -572,10 +564,9 @@ diff --git a/third_party/cacheinvalidation/src/java/com/google/ipc/invalidation/
- this.gcmNetworkManager = gcmNetworkManager;
- }
-
- /**
/**
* Returns true if no registration token is stored or the current application version is higher
* than the version for the token stored.
*/
@@ -142,21 +120,7 @@ public class AndroidGcmController {
return;
}


+ 12
- 12
patches/ungoogled-chromium-android/Remove-dependency-on-com.google.android.gms.vision-com.google.android.gms.clearcut-com.google.android.gms.phenotype.patch View File

@ -483,10 +483,11 @@ diff --git a/services/shape_detection/android/java/src/org/chromium/shape_detect
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
@@ -900,35 +900,6 @@ android_aar_prebuilt("google_play_services_tasks_java") {
@@ -809,35 +809,6 @@ android_aar_prebuilt("google_play_services_tasks_java") {
strip_drawables = true
}
# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
-# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
-android_aar_prebuilt("google_play_services_vision_java") {
- aar_path = "libs/com_google_android_gms_play_services_vision/play-services-vision-15.0.1.aar"
- info_path = "libs/com_google_android_gms_play_services_vision/com_google_android_gms_play_services_vision.info"
@ -515,14 +516,14 @@ diff --git a/third_party/android_deps/BUILD.gn b/third_party/android_deps/BUILD.
- strip_drawables = true
-}
-
-# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
android_aar_prebuilt("com_google_android_material_material_java") {
aar_path = "libs/com_google_android_material_material/material-1.0.0-rc02.aar"
info_path = "libs/com_google_android_material_material/com_google_android_material_material.info"
@@ -1528,25 +1499,6 @@ android_aar_prebuilt("com_android_support_versionedparcelable_java") {
@@ -1437,25 +1408,6 @@ android_aar_prebuilt("com_android_support_versionedparcelable_java") {
ignore_aidl = true
}
# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
-# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
-android_aar_prebuilt("google_play_services_clearcut_java") {
- aar_path = "libs/com_google_android_gms_play_services_clearcut/play-services-clearcut-15.0.1.aar"
- info_path = "libs/com_google_android_gms_play_services_clearcut/com_google_android_gms_play_services_clearcut.info"
@ -541,14 +542,14 @@ diff --git a/third_party/android_deps/BUILD.gn b/third_party/android_deps/BUILD.
- strip_drawables = true
-}
-
-# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
android_aar_prebuilt("google_play_services_flags_java") {
aar_path = "libs/com_google_android_gms_play_services_flags/play-services-flags-15.0.1.aar"
info_path = "libs/com_google_android_gms_play_services_flags/com_google_android_gms_play_services_flags.info"
@@ -1564,24 +1516,6 @@ android_aar_prebuilt("google_play_services_flags_java") {
@@ -1473,24 +1425,6 @@ android_aar_prebuilt("google_play_services_flags_java") {
strip_drawables = true
}
# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
-# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
-android_aar_prebuilt("google_play_services_phenotype_java") {
- aar_path = "libs/com_google_android_gms_play_services_phenotype/play-services-phenotype-15.0.1.aar"
- info_path = "libs/com_google_android_gms_play_services_phenotype/com_google_android_gms_play_services_phenotype.info"
@ -566,10 +567,9 @@ diff --git a/third_party/android_deps/BUILD.gn b/third_party/android_deps/BUILD.
- strip_drawables = true
-}
-
-# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
android_aar_prebuilt("google_play_services_places_placereport_java") {
aar_path = "libs/com_google_android_gms_play_services_places_placereport/play-services-places-placereport-15.0.1.aar"
info_path = "libs/com_google_android_gms_play_services_places_placereport/com_google_android_gms_play_services_places_placereport.info"
--
2.11.0

+ 1
- 1
patches/ungoogled-chromium-android/Remove-dependency-on-com.google.android.play.patch View File

@ -14,7 +14,7 @@ Subject: Remove dependency on com.google.android.play
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
--- a/chrome/android/BUILD.gn
+++ b/chrome/android/BUILD.gn
@@ -387,7 +387,6 @@ android_library("chrome_java") {
@@ -380,7 +380,6 @@ android_library("chrome_java") {
"//third_party/cct_dynamic_module:cct_dynamic_module_java",
"//third_party/feed:feed_lib_proto_java",
"//third_party/gif_player:gif_player_java",


+ 1
- 1
patches/ungoogled-chromium-android/change-package-name-chromium.patch View File

@ -9,7 +9,7 @@ author: Wengling Chen <[email protected]>
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
--- a/chrome/android/BUILD.gn
+++ b/chrome/android/BUILD.gn
@@ -31,8 +31,8 @@ import("java_sources.gni")
@@ -32,8 +32,8 @@ import("java_sources.gni")
import("static_initializers.gni")
import("trichrome.gni")


+ 1
- 1
patches/ungoogled-chromium-android/disable-context-search-by-default.patch View File

@ -8,7 +8,7 @@ author: Wengling Chen <[email protected]>
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/PrefServiceBridge.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/PrefServiceBridge.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/PrefServiceBridge.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/PrefServiceBridge.java
@@ -412,7 +412,7 @@ public class PrefServiceBridge {
@@ -423,7 +423,7 @@ public class PrefServiceBridge {
* @return Whether the Contextual Search feature was disabled by the user explicitly.
*/
public boolean isContextualSearchDisabled() {


+ 14
- 4
patches/ungoogled-chromium-android/linker-android-support-remove.patch View File

@ -1,14 +1,24 @@
description: remove linker flag -landroid_support. We build MonoChrome targets API 24+, which won't need support library anyway
author: Wengling Chen <[email protected]>
---
build/config/android/BUILD.gn | 8 --------
1 file changed, 8 deletions(-)
--- a/build/config/android/BUILD.gn
+++ b/build/config/android/BUILD.gn
@@ -117,7 +117,7 @@
lib_dirs = [ android_libcpp_lib_dir ]
@@ -98,14 +98,6 @@ config("runtime_library") {
libs = []
- libs += [ "android_support" ]
+ # libs += [ "android_support" ]
- # On 64-bit platforms, the only symbols provided by libandroid_support.a are
- # strto{d,f,l,ul}_l. These symbols are not used by our libc++, and newer NDKs
- # don't provide a libandroid_support.a on 64-bit platforms, so we only depend
- # on this library on 32-bit platforms.
- if (current_cpu == "arm" || current_cpu == "x86") {
- libs += [ "android_support" ]
- }
-
# arm builds of libc++ starting in NDK r12 depend on unwind.
if (current_cpu == "arm") {
libs += [ "unwind" ]

+ 0
- 19
patches/ungoogled-chromium-android/uncheck-fre-send-report.patch View File

@ -1,19 +0,0 @@
Uncheck the "Send statistics and crash reports" checkbox on first run.
author: Wengling Chen <[email protected]>
---
.../src/org/chromium/chrome/browser/firstrun/FirstRunActivityBase.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivityBase.java b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivityBase.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivityBase.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivityBase.java
@@ -38,7 +38,7 @@ public abstract class FirstRunActivityBase extends AsyncInitializationActivity {
static final String SHOW_SEARCH_ENGINE_PAGE = "ShowSearchEnginePage";
static final String SHOW_SIGNIN_PAGE = "ShowSignIn";
- public static final boolean DEFAULT_METRICS_AND_CRASH_REPORTING = true;
+ public static final boolean DEFAULT_METRICS_AND_CRASH_REPORTING = false;
private boolean mNativeInitialized;

+ 1
- 2
pruning_2.list View File

@ -1,7 +1,6 @@
./third_party/junit/src/lib/hamcrest-core-1.3.jar
./third_party/junit/src/lib/hamcrest-core-1.3-sources.jar
./third_party/android_build_tools/bundletool/bundletool-all-0.10.0.jar
./third_party/android_build_tools/bundletool/bundletool-all-0.10.3.jar
./third_party/android_protobuf/src/benchmarks/google_message2.dat
./chrome/browser/resource_coordinator/tab_ranker/example_preprocessor_config.pb
./chrome/common/extensions/docs/static/images/app_codelab/step7-completed
./chrome/common/win/eventlog_messages.mc

safe_browsing_proto_files/download_file_types.pb.h
File diff suppressed because it is too large
View File


+ 2085
- 0
safe_browsing_proto_files/webprotect.pb.h
File diff suppressed because it is too large
View File


Loading…
Cancel
Save