Commit cec9203f authored by Natalie Chouinard's avatar Natalie Chouinard Committed by Commit Bot

Replace java_files with sources in //android_webview

Replace usages of java_files with sources in above directory's gn files,
and automatically format.

Bug: 1035074
Change-Id: I71ba271c9752c3b3224a84dcb846868de66079b0
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1977302Reviewed-by: default avatarNate Fischer <ntfschr@chromium.org>
Reviewed-by: default avatarBo <boliu@chromium.org>
Commit-Queue: Natalie Chouinard <chouinard@chromium.org>
Cr-Commit-Position: refs/heads/master@{#726655}
parent 128f6c6a
......@@ -289,7 +289,7 @@ generate_jar_jni("cancellation_signal_android_jar_jni_headers") {
}
android_library("browser_java") {
java_files = [
sources = [
"java/src/org/chromium/android_webview/AndroidProtocolHandler.java",
"java/src/org/chromium/android_webview/AutofillActionModeCallback.java",
"java/src/org/chromium/android_webview/AwActionModeCallback.java",
......@@ -311,8 +311,8 @@ android_library("browser_java") {
"java/src/org/chromium/android_webview/AwCookieManager.java",
"java/src/org/chromium/android_webview/AwDebug.java",
"java/src/org/chromium/android_webview/AwDevToolsServer.java",
"java/src/org/chromium/android_webview/AwFeatures.java",
"java/src/org/chromium/android_webview/AwFeatureList.java",
"java/src/org/chromium/android_webview/AwFeatures.java",
"java/src/org/chromium/android_webview/AwFirebaseConfig.java",
"java/src/org/chromium/android_webview/AwFormDatabase.java",
"java/src/org/chromium/android_webview/AwGeolocationPermissions.java",
......@@ -372,12 +372,12 @@ android_library("browser_java") {
"java/src/org/chromium/android_webview/gfx/JavaBrowserViewRendererHelper.java",
"java/src/org/chromium/android_webview/metrics/AwMetricsLogUploader.java",
"java/src/org/chromium/android_webview/metrics/AwMetricsServiceClient.java",
"java/src/org/chromium/android_webview/safe_browsing/AwSafeBrowsingConfigHelper.java",
"java/src/org/chromium/android_webview/safe_browsing/AwSafeBrowsingConversionHelper.java",
"java/src/org/chromium/android_webview/safe_browsing/AwSafeBrowsingResponse.java",
"java/src/org/chromium/android_webview/permission/AwGeolocationCallback.java",
"java/src/org/chromium/android_webview/permission/AwPermissionRequest.java",
"java/src/org/chromium/android_webview/policy/AwPolicyProvider.java",
"java/src/org/chromium/android_webview/safe_browsing/AwSafeBrowsingConfigHelper.java",
"java/src/org/chromium/android_webview/safe_browsing/AwSafeBrowsingConversionHelper.java",
"java/src/org/chromium/android_webview/safe_browsing/AwSafeBrowsingResponse.java",
]
deps = [
":common_aidl_java",
......@@ -431,7 +431,9 @@ android_library("browser_java") {
}
android_library("common_variations_utils_java") {
java_files = [ "java/src/org/chromium/android_webview/common/variations/VariationsUtils.java" ]
sources = [
"java/src/org/chromium/android_webview/common/variations/VariationsUtils.java",
]
deps = [
"//android_webview/proto:aw_variations_seed_proto_java",
"//base:base_java",
......@@ -444,7 +446,7 @@ android_library("common_variations_utils_java") {
# android_webview_java. It compiles the abstract class; implementations are
# compiled separately.
android_library("common_platform_services_java") {
java_files = [
sources = [
"java/src/org/chromium/android_webview/common/PlatformServiceBridge.java",
"java/src/org/chromium/android_webview/common/PlatformServiceBridgeImpl.java",
]
......@@ -462,14 +464,16 @@ android_library("common_platform_services_java") {
# This target compiles the implementation of PlatformServiceBridge for AOSP targets.
android_library("platform_service_bridge_upstream_implementation_java") {
java_files = [ "java/src/org/chromium/android_webview/common/PlatformServiceBridgeImpl.java" ]
sources = [
"java/src/org/chromium/android_webview/common/PlatformServiceBridgeImpl.java",
]
deps = [
":common_platform_services_java",
]
}
android_library("common_crash_java") {
java_files = [
sources = [
"java/src/org/chromium/android_webview/common/crash/AwCrashReporterClient.java",
"java/src/org/chromium/android_webview/common/crash/CrashInfo.java",
"java/src/org/chromium/android_webview/common/crash/CrashUploadUtil.java",
......@@ -488,7 +492,7 @@ android_library("common_crash_java") {
}
android_library("common_java") {
java_files = [
sources = [
"java/src/org/chromium/android_webview/common/AwResource.java",
"java/src/org/chromium/android_webview/common/Flag.java",
"java/src/org/chromium/android_webview/common/FlagOverrideHelper.java",
......@@ -502,8 +506,9 @@ android_library("common_java") {
}
android_library("common_commandline_java") {
java_files =
[ "java/src/org/chromium/android_webview/common/CommandLineUtil.java" ]
sources = [
"java/src/org/chromium/android_webview/common/CommandLineUtil.java",
]
deps = [
"//base:base_java",
......@@ -534,7 +539,9 @@ generate_product_config_srcjar("webview_product_config") {
# level - with the list of pak locales populated by looking at the assets that
# are listed in the final APK's .build_config.
android_library("android_webview_product_config_java") {
java_files = [ "java/src/org/chromium/android_webview/AwLocaleConfig.java" ]
sources = [
"java/src/org/chromium/android_webview/AwLocaleConfig.java",
]
srcjar_deps = [ ":webview_product_config" ]
jar_excluded_patterns = [ "*/ProductConfig.class" ]
}
......
......@@ -31,7 +31,7 @@ android_library("glue") {
alternative_android_sdk_dep =
"//third_party/android_sdk:public_framework_system_java"
java_files = [
sources = [
"java/src/com/android/webview/chromium/CallbackConverter.java",
"java/src/com/android/webview/chromium/ContentSettingsAdapter.java",
"java/src/com/android/webview/chromium/CookieManagerAdapter.java",
......
......@@ -15,7 +15,7 @@ generate_jni("nonembedded_jni_headers") {
# Contains classes needed by the webview apk, but not used when loading the apk
# as a library.
android_library("nonembedded_java") {
java_files = [
sources = [
"java/src/org/chromium/android_webview/nonembedded/LicenseActivity.java",
"java/src/org/chromium/android_webview/nonembedded/LicenseContentProvider.java",
"java/src/org/chromium/android_webview/nonembedded/WebViewApkApplication.java",
......@@ -35,7 +35,7 @@ android_library("nonembedded_java") {
}
android_library("devui_java") {
java_files = [
sources = [
"java/src/org/chromium/android_webview/devui/CrashesListActivity.java",
"java/src/org/chromium/android_webview/devui/FlagsActivity.java",
"java/src/org/chromium/android_webview/devui/MainActivity.java",
......@@ -67,7 +67,7 @@ android_library("devui_java") {
}
android_library("services_java") {
java_files = [
sources = [
"java/src/org/chromium/android_webview/services/AwMinidumpUploadJobService.java",
"java/src/org/chromium/android_webview/services/AwMinidumpUploaderDelegate.java",
"java/src/org/chromium/android_webview/services/AwVariationsSeedFetcher.java",
......
......@@ -6,7 +6,7 @@ import("//build/config/android/config.gni")
import("//build/config/android/rules.gni")
android_library("support_lib_glue_java") {
java_files = [
sources = [
"java/src/org/chromium/support_lib_glue/IsomorphicAdapter.java",
"java/src/org/chromium/support_lib_glue/SupportLibJsReplyProxyAdapter.java",
"java/src/org/chromium/support_lib_glue/SupportLibProxyControllerAdapter.java",
......
......@@ -6,7 +6,7 @@ import("//build/config/android/config.gni")
import("//build/config/android/rules.gni")
android_library("boundary_interface_java") {
java_files = [
sources = [
"src/org/chromium/support_lib_boundary/FeatureFlagHolderBoundaryInterface.java",
"src/org/chromium/support_lib_boundary/IsomorphicObjectBoundaryInterface.java",
"src/org/chromium/support_lib_boundary/JsReplyProxyBoundaryInterface.java",
......
......@@ -6,7 +6,7 @@ import("//build/config/android/config.gni")
import("//build/config/android/rules.gni")
android_library("callback_java") {
java_files = [
sources = [
"java/src/org/chromium/support_lib_callback_glue/SupportLibSafeBrowsingResponse.java",
"java/src/org/chromium/support_lib_callback_glue/SupportLibWebResourceError.java",
"java/src/org/chromium/support_lib_callback_glue/SupportLibWebViewContentsClientAdapter.java",
......
......@@ -77,18 +77,18 @@ android_apk("webview_instrumentation_apk") {
apk_name = "WebViewInstrumentation"
android_manifest = "shell/AndroidManifest.xml"
java_files = [
sources = [
"shell/src/org/chromium/android_webview/shell/AwShellActivity.java",
"shell/src/org/chromium/android_webview/shell/AwShellApplication.java",
"shell/src/org/chromium/android_webview/shell/AwShellResourceProvider.java",
"shell/src/org/chromium/android_webview/shell/AwShellSwitches.java",
"shell/src/org/chromium/android_webview/shell/DrawFn.java",
"shell/src/org/chromium/android_webview/test/AwJUnit4ClassRunner.java",
"shell/src/org/chromium/android_webview/test/AwTestContainerView.java",
"shell/src/org/chromium/android_webview/test/AwTestRunnerActivity.java",
"shell/src/org/chromium/android_webview/test/AwJUnit4ClassRunner.java",
"shell/src/org/chromium/android_webview/test/NullContentsClient.java",
"shell/src/org/chromium/android_webview/test/SecondBrowserProcess.java",
"shell/src/org/chromium/android_webview/test/OnlyRunIn.java",
"shell/src/org/chromium/android_webview/test/SecondBrowserProcess.java",
"shell/src/org/chromium/android_webview/test/TestContentProvider.java",
]
product_config_java_packages = [ webview_product_config_java_package ]
......@@ -195,7 +195,7 @@ instrumentation_test_apk("webview_instrumentation_test_apk") {
"//third_party/metrics_proto:metrics_proto_java",
"//ui/android:ui_java",
]
java_files = [
sources = [
"../javatests/src/org/chromium/android_webview/test/AcceptLanguageTest.java",
"../javatests/src/org/chromium/android_webview/test/AndroidProtocolHandlerTest.java",
"../javatests/src/org/chromium/android_webview/test/AndroidScrollIntegrationTest.java",
......@@ -212,8 +212,8 @@ instrumentation_test_apk("webview_instrumentation_test_apk") {
"../javatests/src/org/chromium/android_webview/test/AwContentsClientFullScreenTest.java",
"../javatests/src/org/chromium/android_webview/test/AwContentsClientGetDefaultVideoPosterTest.java",
"../javatests/src/org/chromium/android_webview/test/AwContentsClientOnFormResubmissionTest.java",
"../javatests/src/org/chromium/android_webview/test/AwContentsClientOnRendererUnresponsiveTest.java",
"../javatests/src/org/chromium/android_webview/test/AwContentsClientOnRenderProcessGoneTest.java",
"../javatests/src/org/chromium/android_webview/test/AwContentsClientOnRendererUnresponsiveTest.java",
"../javatests/src/org/chromium/android_webview/test/AwContentsClientOnScaleChangedTest.java",
"../javatests/src/org/chromium/android_webview/test/AwContentsClientOnUnhandledKeyEventTest.java",
"../javatests/src/org/chromium/android_webview/test/AwContentsClientShouldInterceptRequestTest.java",
......@@ -240,6 +240,7 @@ instrumentation_test_apk("webview_instrumentation_test_apk") {
"../javatests/src/org/chromium/android_webview/test/AwServiceWorkerClientTest.java",
"../javatests/src/org/chromium/android_webview/test/AwSettingsTest.java",
"../javatests/src/org/chromium/android_webview/test/AwStrictModeTest.java",
"../javatests/src/org/chromium/android_webview/test/AwUncaughtExceptionTest.java",
"../javatests/src/org/chromium/android_webview/test/AwVariationsSeedFetcherTest.java",
"../javatests/src/org/chromium/android_webview/test/AwWebContentsObserverTest.java",
"../javatests/src/org/chromium/android_webview/test/AwZoomTest.java",
......@@ -274,9 +275,8 @@ instrumentation_test_apk("webview_instrumentation_test_apk") {
"../javatests/src/org/chromium/android_webview/test/PopupWindowTest.java",
"../javatests/src/org/chromium/android_webview/test/PostMessageTest.java",
"../javatests/src/org/chromium/android_webview/test/RenderProcessGoneHelper.java",
"../javatests/src/org/chromium/android_webview/test/SaveRestoreStateTest.java",
"../javatests/src/org/chromium/android_webview/test/SafeBrowsingTest.java",
"../javatests/src/org/chromium/android_webview/test/AwUncaughtExceptionTest.java",
"../javatests/src/org/chromium/android_webview/test/SaveRestoreStateTest.java",
"../javatests/src/org/chromium/android_webview/test/SslPreferencesTest.java",
"../javatests/src/org/chromium/android_webview/test/StandaloneAwQuotaManagerBridgeTest.java",
"../javatests/src/org/chromium/android_webview/test/TestAwContents.java",
......@@ -340,7 +340,9 @@ instrumentation_test_apk("webview_instrumentation_test_apk") {
android_library("webview_instrumentation_test_utils_java") {
testonly = true
java_files = [ "shell/src/org/chromium/android_webview/test/util/MemoryMetricsLoggerUtils.java" ]
sources = [
"shell/src/org/chromium/android_webview/test/util/MemoryMetricsLoggerUtils.java",
]
deps = [
"//base:base_java",
"//base:jni_java",
......@@ -433,7 +435,7 @@ android_library("android_webview_unittests_java") {
"//base:base_java",
"//content/public/test/android:content_java_test_support",
]
java_files = [
sources = [
"../unittestjava/src/org/chromium/android_webview/unittest/InputStreamUnittest.java",
"../unittestjava/src/org/chromium/android_webview/unittest/MockAwContentsClientBridge.java",
]
......@@ -449,10 +451,10 @@ generate_jni("android_webview_unittests_jni") {
# robolectric tests
junit_binary("android_webview_junit_tests") {
java_files = [
sources = [
"../junit/src/org/chromium/android_webview/robolectric/AwLayoutSizerTest.java",
"../junit/src/org/chromium/android_webview/robolectric/FindAddressTest.java",
"../junit/src/org/chromium/android_webview/robolectric/AwScrollOffsetManagerTest.java",
"../junit/src/org/chromium/android_webview/robolectric/FindAddressTest.java",
"../junit/src/org/chromium/android_webview/robolectric/common/FlagOverrideHelperTest.java",
"../junit/src/org/chromium/android_webview/robolectric/common/services/ServiceNamesTest.java",
"../junit/src/org/chromium/android_webview/robolectric/services/AwVariationsSeedFetcherTest.java",
......
......@@ -7,7 +7,7 @@ import("//build/config/android/rules.gni")
android_library("aw_net_java_test_support") {
testonly = true
java_files = [
sources = [
"java/src/org/chromium/android_webview/test/AwEmbeddedTestServer.java",
"java/src/org/chromium/android_webview/test/AwEmbeddedTestServerImpl.java",
"java/src/org/chromium/android_webview/test/AwEmbeddedTestServerService.java",
......
......@@ -23,8 +23,9 @@ android_apk("webview_ui_test_app_apk") {
}
android_library("webview_ui_test_app_java") {
java_files =
[ "java/src/org/chromium/webview_ui_test/WebViewUiTestActivity.java" ]
sources = [
"java/src/org/chromium/webview_ui_test/WebViewUiTestActivity.java",
]
deps = [
":webview_ui_test_app_apk_resources",
"//base:base_java",
......@@ -42,15 +43,15 @@ instrumentation_test_apk("webview_ui_test_app_test_apk") {
apk_name = "WebViewUiTestAppTest"
apk_under_test = ":webview_ui_test_app_apk"
android_manifest = "javatests/AndroidManifest.xml"
java_files = [
sources = [
"javatests/src/org/chromium/webview_ui_test/test/ActionModeTest.java",
"javatests/src/org/chromium/webview_ui_test/test/DropDownListTest.java",
"javatests/src/org/chromium/webview_ui_test/test/WebViewJSTest.java",
"javatests/src/org/chromium/webview_ui_test/test/util/Actions.java",
"javatests/src/org/chromium/webview_ui_test/test/util/Atoms.java",
"javatests/src/org/chromium/webview_ui_test/test/util/UseLayout.java",
"javatests/src/org/chromium/webview_ui_test/test/util/WebViewUiTestRule.java",
"javatests/src/org/chromium/webview_ui_test/test/util/WebViewSyncWrapper.java",
"javatests/src/org/chromium/webview_ui_test/test/util/WebViewUiTestRule.java",
]
deps = [
":webview_ui_test_app_apk_resources",
......
......@@ -18,7 +18,7 @@ group("system_webview_shell") {
android_apk("system_webview_shell_apk") {
apk_name = "SystemWebViewShell"
java_files = [
sources = [
"apk/src/org/chromium/webview_shell/JankActivity.java",
"apk/src/org/chromium/webview_shell/PageCyclerTestActivity.java",
"apk/src/org/chromium/webview_shell/StartupTimeActivity.java",
......@@ -56,7 +56,9 @@ instrumentation_test_apk("system_webview_shell_page_cycler_apk") {
apk_name = "SystemWebViewShellPageCycler"
apk_under_test = ":system_webview_shell_apk"
android_manifest = "page_cycler/AndroidManifest.xml"
java_files = [ "page_cycler/src/org/chromium/webview_shell/page_cycler/PageCyclerTest.java" ]
sources = [
"page_cycler/src/org/chromium/webview_shell/page_cycler/PageCyclerTest.java",
]
deps = [
"//base:base_java",
"//base:base_java_test_support",
......@@ -73,7 +75,7 @@ instrumentation_test_apk("system_webview_shell_layout_test_apk") {
apk_name = "SystemWebViewShellLayoutTest"
apk_under_test = ":system_webview_shell_apk"
android_manifest = "layout_tests/AndroidManifest.xml"
java_files = [
sources = [
"layout_tests/src/org/chromium/webview_shell/test/WebPlatformTestsActivityTest.java",
"layout_tests/src/org/chromium/webview_shell/test/WebViewLayoutTest.java",
"layout_tests/src/org/chromium/webview_shell/test/WebViewThreadTest.java",
......
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