CarlandGitHub
68e2652402
Patches for v97 Add uazo's patch to build with use_sysroot=false Start using new SystemWebView package name Cleanup metrics patches and add a few more patches from Vanadium Enable use_cfi_cast
38 lines
1.8 KiB
Diff
38 lines
1.8 KiB
Diff
From: Daniel Micay <danielmicay@gmail.com>
|
|
Date: Thu, 10 Dec 2020 10:09:18 -0500
|
|
Subject: disable WebView variations support
|
|
|
|
---
|
|
.../com/android/webview/chromium/WebViewChromiumAwInit.java | 4 ----
|
|
.../webview/chromium/WebViewChromiumFactoryProvider.java | 2 --
|
|
2 files changed, 6 deletions(-)
|
|
|
|
diff --git a/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumAwInit.java b/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumAwInit.java
|
|
--- a/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumAwInit.java
|
|
+++ b/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumAwInit.java
|
|
@@ -196,10 +196,6 @@ public class WebViewChromiumAwInit {
|
|
|
|
AwBrowserProcess.configureChildProcessLauncher();
|
|
|
|
- // finishVariationsInitLocked() must precede native initialization so the seed is
|
|
- // available when AwFeatureListCreator::SetUpFieldTrials() runs.
|
|
- finishVariationsInitLocked();
|
|
-
|
|
AwBrowserProcess.start();
|
|
AwBrowserProcess.handleMinidumpsAndSetMetricsConsent(true /* updateMetricsConsent */);
|
|
|
|
diff --git a/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumFactoryProvider.java b/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
|
|
--- a/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
|
|
+++ b/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
|
|
@@ -431,8 +431,6 @@ public class WebViewChromiumFactoryProvider implements WebViewFactoryProvider {
|
|
}
|
|
}
|
|
|
|
- mAwInit.startVariationsInit();
|
|
-
|
|
mShouldDisableThreadChecking = shouldDisableThreadChecking(ctx);
|
|
|
|
setSingleton(this);
|
|
--
|
|
2.25.1
|