Commit 23c2ddf8 authored by Robbie McElrath's avatar Robbie McElrath Committed by Commit Bot

[AW] Move AwSwitches to android_webview.common

This moves AwSwitches to org.chromium.android_webview.common so flags
can be used outside the browser process. This was broken off from
crrev.com/c/2002897 to keep the change history correct.

Test: ninja -C out/aw system_webview_apk
Bug: 1035235
Change-Id: I283273ad70d6b9b71efefc9c198be3f796e8c8f3
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2003031
Commit-Queue: Robbie McElrath <rmcelrath@chromium.org>
Reviewed-by: default avatarNate Fischer <ntfschr@chromium.org>
Reviewed-by: default avatarChangwan Ryu <changwan@chromium.org>
Cr-Commit-Position: refs/heads/master@{#732978}
parent 9fe8a648
...@@ -395,7 +395,6 @@ android_library("browser_java") { ...@@ -395,7 +395,6 @@ android_library("browser_java") {
"java/src/org/chromium/android_webview/AwServiceWorkerSettings.java", "java/src/org/chromium/android_webview/AwServiceWorkerSettings.java",
"java/src/org/chromium/android_webview/AwSettings.java", "java/src/org/chromium/android_webview/AwSettings.java",
"java/src/org/chromium/android_webview/AwSupportLibIsomorphic.java", "java/src/org/chromium/android_webview/AwSupportLibIsomorphic.java",
"java/src/org/chromium/android_webview/AwSwitches.java",
"java/src/org/chromium/android_webview/AwTracingController.java", "java/src/org/chromium/android_webview/AwTracingController.java",
"java/src/org/chromium/android_webview/AwVariationsSeedBridge.java", "java/src/org/chromium/android_webview/AwVariationsSeedBridge.java",
"java/src/org/chromium/android_webview/AwViewAndroidDelegate.java", "java/src/org/chromium/android_webview/AwViewAndroidDelegate.java",
...@@ -558,6 +557,7 @@ android_library("common_crash_java") { ...@@ -558,6 +557,7 @@ android_library("common_crash_java") {
android_library("common_java") { android_library("common_java") {
sources = [ sources = [
"java/src/org/chromium/android_webview/common/AwResource.java", "java/src/org/chromium/android_webview/common/AwResource.java",
"java/src/org/chromium/android_webview/common/AwSwitches.java",
"java/src/org/chromium/android_webview/common/DeveloperModeUtils.java", "java/src/org/chromium/android_webview/common/DeveloperModeUtils.java",
"java/src/org/chromium/android_webview/common/Flag.java", "java/src/org/chromium/android_webview/common/Flag.java",
"java/src/org/chromium/android_webview/common/FlagOverrideHelper.java", "java/src/org/chromium/android_webview/common/FlagOverrideHelper.java",
......
...@@ -96,7 +96,7 @@ Some interesting flags and Features: ...@@ -96,7 +96,7 @@ Some interesting flags and Features:
WebView also defines its own flags and Features: WebView also defines its own flags and Features:
* [AwSwitches.java](https://cs.chromium.org/chromium/src/android_webview/java/src/org/chromium/android_webview/AwSwitches.java) * [AwSwitches.java](https://cs.chromium.org/chromium/src/android_webview/java/src/org/chromium/android_webview/common/AwSwitches.java)
(and its [native (and its [native
counterpart](https://cs.chromium.org/chromium/src/android_webview/common/aw_switches.h)) counterpart](https://cs.chromium.org/chromium/src/android_webview/common/aw_switches.h))
* [AwFeatureList.java](https://cs.chromium.org/chromium/src/android_webview/java/src/org/chromium/android_webview/AwFeatureList.java) * [AwFeatureList.java](https://cs.chromium.org/chromium/src/android_webview/java/src/org/chromium/android_webview/AwFeatureList.java)
......
...@@ -33,9 +33,9 @@ import com.android.webview.chromium.WebViewDelegateFactory.WebViewDelegate; ...@@ -33,9 +33,9 @@ import com.android.webview.chromium.WebViewDelegateFactory.WebViewDelegate;
import org.chromium.android_webview.AwBrowserContext; import org.chromium.android_webview.AwBrowserContext;
import org.chromium.android_webview.AwBrowserProcess; import org.chromium.android_webview.AwBrowserProcess;
import org.chromium.android_webview.AwSettings; import org.chromium.android_webview.AwSettings;
import org.chromium.android_webview.AwSwitches;
import org.chromium.android_webview.ProductConfig; import org.chromium.android_webview.ProductConfig;
import org.chromium.android_webview.WebViewChromiumRunQueue; import org.chromium.android_webview.WebViewChromiumRunQueue;
import org.chromium.android_webview.common.AwSwitches;
import org.chromium.android_webview.common.CommandLineUtil; import org.chromium.android_webview.common.CommandLineUtil;
import org.chromium.base.BuildInfo; import org.chromium.base.BuildInfo;
import org.chromium.base.CommandLine; import org.chromium.base.CommandLine;
......
...@@ -14,6 +14,7 @@ import android.os.ParcelFileDescriptor; ...@@ -14,6 +14,7 @@ import android.os.ParcelFileDescriptor;
import android.os.RemoteException; import android.os.RemoteException;
import android.os.StrictMode; import android.os.StrictMode;
import org.chromium.android_webview.common.AwSwitches;
import org.chromium.android_webview.common.CommandLineUtil; import org.chromium.android_webview.common.CommandLineUtil;
import org.chromium.android_webview.common.PlatformServiceBridge; import org.chromium.android_webview.common.PlatformServiceBridge;
import org.chromium.android_webview.common.services.ICrashReceiverService; import org.chromium.android_webview.common.services.ICrashReceiverService;
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
package org.chromium.android_webview; package org.chromium.android_webview.common;
/** /**
* Contains command line switches that are specific to Android WebView. * Contains command line switches that are specific to Android WebView.
......
...@@ -11,7 +11,7 @@ import android.content.pm.PackageManager; ...@@ -11,7 +11,7 @@ import android.content.pm.PackageManager;
import androidx.annotation.IntDef; import androidx.annotation.IntDef;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import org.chromium.android_webview.AwSwitches; import org.chromium.android_webview.common.AwSwitches;
import org.chromium.android_webview.common.PlatformServiceBridge; import org.chromium.android_webview.common.PlatformServiceBridge;
import org.chromium.base.Callback; import org.chromium.base.Callback;
import org.chromium.base.CommandLine; import org.chromium.base.CommandLine;
......
...@@ -31,10 +31,10 @@ import org.chromium.android_webview.AwContents.NativeDrawFunctorFactory; ...@@ -31,10 +31,10 @@ import org.chromium.android_webview.AwContents.NativeDrawFunctorFactory;
import org.chromium.android_webview.AwContentsClient; import org.chromium.android_webview.AwContentsClient;
import org.chromium.android_webview.AwContentsStatics; import org.chromium.android_webview.AwContentsStatics;
import org.chromium.android_webview.AwSettings; import org.chromium.android_webview.AwSettings;
import org.chromium.android_webview.AwSwitches;
import org.chromium.android_webview.AwWebContentsObserver; import org.chromium.android_webview.AwWebContentsObserver;
import org.chromium.android_webview.ErrorCodeConversionHelper; import org.chromium.android_webview.ErrorCodeConversionHelper;
import org.chromium.android_webview.SafeBrowsingAction; import org.chromium.android_webview.SafeBrowsingAction;
import org.chromium.android_webview.common.AwSwitches;
import org.chromium.android_webview.safe_browsing.AwSafeBrowsingConfigHelper; import org.chromium.android_webview.safe_browsing.AwSafeBrowsingConfigHelper;
import org.chromium.android_webview.safe_browsing.AwSafeBrowsingConversionHelper; import org.chromium.android_webview.safe_browsing.AwSafeBrowsingConversionHelper;
import org.chromium.android_webview.safe_browsing.AwSafeBrowsingResponse; import org.chromium.android_webview.safe_browsing.AwSafeBrowsingResponse;
......
...@@ -10,7 +10,7 @@ import org.junit.runner.notification.RunNotifier; ...@@ -10,7 +10,7 @@ import org.junit.runner.notification.RunNotifier;
import org.junit.runners.model.FrameworkMethod; import org.junit.runners.model.FrameworkMethod;
import org.junit.runners.model.InitializationError; import org.junit.runners.model.InitializationError;
import org.chromium.android_webview.AwSwitches; import org.chromium.android_webview.common.AwSwitches;
import org.chromium.android_webview.test.OnlyRunIn.ProcessMode; import org.chromium.android_webview.test.OnlyRunIn.ProcessMode;
import org.chromium.base.CommandLine; import org.chromium.base.CommandLine;
import org.chromium.base.test.BaseJUnit4ClassRunner; import org.chromium.base.test.BaseJUnit4ClassRunner;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment