Disable DICE and MIRROR gaia mode
This commit is contained in:
parent
b0edac38d4
commit
0da64e94c4
2 changed files with 51 additions and 0 deletions
|
@ -184,3 +184,4 @@ Site-setting-for-javascript-jit.patch
|
|||
Allow-change-keep-navigation-history.patch
|
||||
Fix-Note9-startup-crash.patch
|
||||
Add-site-settings-for-webgl.patch
|
||||
Disable-DICE-MIRROR-gaia-mode.patch
|
||||
|
|
50
build/patches/Disable-DICE-MIRROR-gaia-mode.patch
Normal file
50
build/patches/Disable-DICE-MIRROR-gaia-mode.patch
Normal file
|
@ -0,0 +1,50 @@
|
|||
From: uazo <uazo@users.noreply.github.com>
|
||||
Date: Wed, 16 Feb 2022 13:54:36 +0000
|
||||
Subject: Disable DICE and MIRROR gaia mode
|
||||
|
||||
prevents the error
|
||||
Failed to find class org/chromium/chrome/browser/signin/SigninBridge
|
||||
---
|
||||
chrome/browser/signin/account_consistency_mode_manager.cc | 7 +++----
|
||||
components/signin/features.gni | 4 ++--
|
||||
2 files changed, 5 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/chrome/browser/signin/account_consistency_mode_manager.cc b/chrome/browser/signin/account_consistency_mode_manager.cc
|
||||
--- a/chrome/browser/signin/account_consistency_mode_manager.cc
|
||||
+++ b/chrome/browser/signin/account_consistency_mode_manager.cc
|
||||
@@ -31,9 +31,9 @@
|
||||
#error "Dice and Mirror cannot be both enabled."
|
||||
#endif
|
||||
|
||||
-#if !BUILDFLAG(ENABLE_DICE_SUPPORT) && !BUILDFLAG(ENABLE_MIRROR)
|
||||
-#error "Either Dice or Mirror should be enabled."
|
||||
-#endif
|
||||
+// #if !BUILDFLAG(ENABLE_DICE_SUPPORT) && !BUILDFLAG(ENABLE_MIRROR)
|
||||
+// #error "Either Dice or Mirror should be enabled."
|
||||
+// #endif
|
||||
|
||||
using signin::AccountConsistencyMethod;
|
||||
|
||||
@@ -203,6 +203,5 @@ AccountConsistencyModeManager::ComputeAccountConsistencyMethod(
|
||||
return AccountConsistencyMethod::kDice;
|
||||
#endif
|
||||
|
||||
- NOTREACHED();
|
||||
return AccountConsistencyMethod::kDisabled;
|
||||
}
|
||||
diff --git a/components/signin/features.gni b/components/signin/features.gni
|
||||
--- a/components/signin/features.gni
|
||||
+++ b/components/signin/features.gni
|
||||
@@ -5,7 +5,7 @@
|
||||
import("//build/config/chromeos/ui_mode.gni")
|
||||
|
||||
# Dice is supported on the platform (but not necessarily enabled).
|
||||
-enable_dice_support = is_linux || is_mac || is_win || is_fuchsia
|
||||
+enable_dice_support = false
|
||||
|
||||
# Mirror is enabled and other account consistency mechanisms are not available.
|
||||
-enable_mirror = is_android || is_chromeos_ash || is_chromeos_lacros || is_ios
|
||||
+enable_mirror = false
|
||||
--
|
||||
2.20.1
|
||||
|
Loading…
Add table
Reference in a new issue