0ct0pu5/bromite
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix SystemWebView building issue and signin crash

Browse source
This commit is contained in:
csagan5 2022-07-08 23:13:21 +02:00
parent b60242dde9
commit 8439ece721
3 changed files with 47 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build/patches/Allow-building-without-enable_reporting.patch
View file

@ -33,7 +33,7 @@ diff --git a/android_webview/browser/aw_contents.cc b/android_webview/browser/aw
+ enable_download_manager)
: base::BindRepeating(&autofill::BrowserDriverInitHook,
AwAutofillClient::FromWebContents(web_contents),
base::android::GetDefaultLocaleString());
base::android::GetDefaultLocaleString(),
diff --git a/content/browser/devtools/protocol/network_handler.cc b/content/browser/devtools/protocol/network_handler.cc
--- a/content/browser/devtools/protocol/network_handler.cc
+++ b/content/browser/devtools/protocol/network_handler.cc

13
build/patches/Enable-native-Android-autofill.patch
View file

@ -15,7 +15,7 @@ See also: https://github.com/bromite/bromite/issues/547
Original License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
---
android_webview/browser/aw_contents.cc | 2 +-
android_webview/browser/aw_contents.cc | 5 +-
chrome/android/BUILD.gn | 1 +
.../settings/PasswordSettings.java | 81 ++++++++++++++++++-
.../chromium/chrome/browser/tab/TabImpl.java | 50 ++++++++++++
@ -37,12 +37,12 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
.../autofill/core/common/autofill_prefs.h | 2 +
.../embedder_support/view/ContentView.java | 46 +++++++++++
.../chromium/ui/base/ViewAndroidDelegate.java | 8 ++
22 files changed, 310 insertions(+), 13 deletions(-)
22 files changed, 312 insertions(+), 14 deletions(-)
diff --git a/android_webview/browser/aw_contents.cc b/android_webview/browser/aw_contents.cc
--- a/android_webview/browser/aw_contents.cc
+++ b/android_webview/browser/aw_contents.cc
@@ -339,7 +339,7 @@ void AwContents::InitAutofillIfNecessary(bool autocomplete_enabled) {
@@ -339,10 +339,11 @@ void AwContents::InitAutofillIfNecessary(bool autocomplete_enabled) {
autofill_provider
? base::BindRepeating(&autofill::AndroidDriverInitHook,
AwAutofillClient::FromWebContents(web_contents),
@ -50,7 +50,12 @@ diff --git a/android_webview/browser/aw_contents.cc b/android_webview/browser/aw
+ enable_download_manager, /*enable_browser_autofill_manager*/ false)
: base::BindRepeating(&autofill::BrowserDriverInitHook,
AwAutofillClient::FromWebContents(web_contents),
base::android::GetDefaultLocaleString());
- base::android::GetDefaultLocaleString());
+ base::android::GetDefaultLocaleString(),
+ /*enable_secondary_autofill_manager*/ false);
ContentAutofillDriverFactory::CreateForWebContentsAndDelegate(
web_contents, AwAutofillClient::FromWebContents(web_contents),
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
--- a/chrome/android/BUILD.gn
+++ b/chrome/android/BUILD.gn

38
build/patches/Remove-signin-and-sync-integrations.patch
View file

@ -72,6 +72,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
.../tabbed_mode/TabbedRootUiCoordinator.java | 19 --
.../browser/tasks/ReturnToChromeUtil.java | 9 +-
chrome/browser/BUILD.gn | 11 -
...mobile_identity_consistency_field_trial.cc | 15 +-
chrome/browser/feed/android/BUILD.gn | 1 -
.../chrome/browser/feed/FeedFeatures.java | 2 -
.../browser/firstrun/MobileFreProgress.java | 4 +-
@ -106,7 +107,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
.../signin/SystemAccountManagerDelegate.java | 25 +--
.../net/HttpNegotiateAuthenticator.java | 88 +-------
.../chromoting/base/OAuthTokenFetcher.java | 2 -
87 files changed, 82 insertions(+), 2085 deletions(-)
88 files changed, 85 insertions(+), 2097 deletions(-)
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
--- a/chrome/android/BUILD.gn
@ -3246,6 +3247,41 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
"upgrade_detector/get_installed_version.cc",
"upgrade_detector/get_installed_version.h",
"upgrade_detector/installed_version_monitor.h",
diff --git a/chrome/browser/android/signin/fre_mobile_identity_consistency_field_trial.cc b/chrome/browser/android/signin/fre_mobile_identity_consistency_field_trial.cc
--- a/chrome/browser/android/signin/fre_mobile_identity_consistency_field_trial.cc
+++ b/chrome/browser/android/signin/fre_mobile_identity_consistency_field_trial.cc
@@ -5,28 +5,19 @@
#include "chrome/browser/android/signin/fre_mobile_identity_consistency_field_trial.h"
#include "base/android/jni_android.h"
#include "base/android/jni_string.h"
-#include "chrome/browser/signin/services/android/jni_headers/FREMobileIdentityConsistencyFieldTrial_jni.h"
namespace fre_mobile_identity_consistency_field_trial {
std::string GetFREFieldTrialGroup() {
- JNIEnv* env = base::android::AttachCurrentThread();
- base::android::ScopedJavaLocalRef<jstring> group =
- Java_FREMobileIdentityConsistencyFieldTrial_getFirstRunTrialGroup(env);
- return base::android::ConvertJavaStringToUTF8(env, group);
+ return std::string();
}
bool IsFREFieldTrialEnabled() {
- JNIEnv* env = base::android::AttachCurrentThread();
- return Java_FREMobileIdentityConsistencyFieldTrial_isEnabled(env);
+ return false;
}
std::string GetFREVariationsFieldTrialGroup() {
- JNIEnv* env = base::android::AttachCurrentThread();
- base::android::ScopedJavaLocalRef<jstring> group =
- Java_FREMobileIdentityConsistencyFieldTrial_getFirstRunVariationsTrialGroup(
- env);
- return base::android::ConvertJavaStringToUTF8(env, group);
+ return std::string();
}
} // namespace fre_mobile_identity_consistency_field_trial
diff --git a/chrome/browser/feed/android/BUILD.gn b/chrome/browser/feed/android/BUILD.gn
--- a/chrome/browser/feed/android/BUILD.gn
+++ b/chrome/browser/feed/android/BUILD.gn