Commit 9e87d6a1 authored by Natalie Chouinard's avatar Natalie Chouinard Committed by Commit Bot

Replace java_files with sources in //content

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

Bug: 1035074
Change-Id: Ibf2cefba17f5570a5869c2122646b261ae26f296
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1977303Reviewed-by: default avatarAlex Moshchuk <alexmos@chromium.org>
Commit-Queue: Natalie Chouinard <chouinard@chromium.org>
Cr-Commit-Position: refs/heads/master@{#726651}
parent 1d9b5b3a
...@@ -105,7 +105,7 @@ android_library("content_java") { ...@@ -105,7 +105,7 @@ android_library("content_java") {
"//ui/touch_selection:ui_touch_selection_enums_srcjar", "//ui/touch_selection:ui_touch_selection_enums_srcjar",
] ]
java_files = [ sources = [
"java/src/org/chromium/content/app/ChromiumLinkerParams.java", "java/src/org/chromium/content/app/ChromiumLinkerParams.java",
"java/src/org/chromium/content/app/ContentChildProcessService.java", "java/src/org/chromium/content/app/ContentChildProcessService.java",
"java/src/org/chromium/content/app/ContentChildProcessServiceDelegate.java", "java/src/org/chromium/content/app/ContentChildProcessServiceDelegate.java",
...@@ -124,7 +124,6 @@ android_library("content_java") { ...@@ -124,7 +124,6 @@ android_library("content_java") {
"java/src/org/chromium/content/browser/BackgroundSyncNetworkObserver.java", "java/src/org/chromium/content/browser/BackgroundSyncNetworkObserver.java",
"java/src/org/chromium/content/browser/BindingManager.java", "java/src/org/chromium/content/browser/BindingManager.java",
"java/src/org/chromium/content/browser/BrowserStartupControllerImpl.java", "java/src/org/chromium/content/browser/BrowserStartupControllerImpl.java",
"java/src/org/chromium/content/browser/ServicificationStartupUma.java",
"java/src/org/chromium/content/browser/ChildProcessCreationParamsImpl.java", "java/src/org/chromium/content/browser/ChildProcessCreationParamsImpl.java",
"java/src/org/chromium/content/browser/ChildProcessLauncherHelperImpl.java", "java/src/org/chromium/content/browser/ChildProcessLauncherHelperImpl.java",
"java/src/org/chromium/content/browser/ChildProcessRanking.java", "java/src/org/chromium/content/browser/ChildProcessRanking.java",
...@@ -149,24 +148,25 @@ android_library("content_java") { ...@@ -149,24 +148,25 @@ android_library("content_java") {
"java/src/org/chromium/content/browser/MediaSessionImpl.java", "java/src/org/chromium/content/browser/MediaSessionImpl.java",
"java/src/org/chromium/content/browser/MotionEventSynthesizerImpl.java", "java/src/org/chromium/content/browser/MotionEventSynthesizerImpl.java",
"java/src/org/chromium/content/browser/NfcHost.java", "java/src/org/chromium/content/browser/NfcHost.java",
"java/src/org/chromium/content/browser/TtsPlatformImpl.java",
"java/src/org/chromium/content/browser/PopupController.java", "java/src/org/chromium/content/browser/PopupController.java",
"java/src/org/chromium/content/browser/RenderCoordinatesImpl.java", "java/src/org/chromium/content/browser/RenderCoordinatesImpl.java",
"java/src/org/chromium/content/browser/RenderWidgetHostViewImpl.java", "java/src/org/chromium/content/browser/RenderWidgetHostViewImpl.java",
"java/src/org/chromium/content/browser/ScreenOrientationProviderImpl.java", "java/src/org/chromium/content/browser/ScreenOrientationProviderImpl.java",
"java/src/org/chromium/content/browser/ServicificationStartupUma.java",
"java/src/org/chromium/content/browser/SpareChildConnection.java", "java/src/org/chromium/content/browser/SpareChildConnection.java",
"java/src/org/chromium/content/browser/SpeechRecognitionImpl.java", "java/src/org/chromium/content/browser/SpeechRecognitionImpl.java",
"java/src/org/chromium/content/browser/SyntheticGestureTarget.java", "java/src/org/chromium/content/browser/SyntheticGestureTarget.java",
"java/src/org/chromium/content/browser/TracingControllerAndroidImpl.java", "java/src/org/chromium/content/browser/TracingControllerAndroidImpl.java",
"java/src/org/chromium/content/browser/TtsPlatformImpl.java",
"java/src/org/chromium/content/browser/UiThreadTaskTraitsImpl.java", "java/src/org/chromium/content/browser/UiThreadTaskTraitsImpl.java",
"java/src/org/chromium/content/browser/ViewEventSinkImpl.java", "java/src/org/chromium/content/browser/ViewEventSinkImpl.java",
"java/src/org/chromium/content/browser/WindowEventObserver.java", "java/src/org/chromium/content/browser/WindowEventObserver.java",
"java/src/org/chromium/content/browser/WindowEventObserverManager.java", "java/src/org/chromium/content/browser/WindowEventObserverManager.java",
"java/src/org/chromium/content/browser/accessibility/BrowserAccessibilityState.java",
"java/src/org/chromium/content/browser/accessibility/KitKatWebContentsAccessibility.java", "java/src/org/chromium/content/browser/accessibility/KitKatWebContentsAccessibility.java",
"java/src/org/chromium/content/browser/accessibility/LollipopWebContentsAccessibility.java", "java/src/org/chromium/content/browser/accessibility/LollipopWebContentsAccessibility.java",
"java/src/org/chromium/content/browser/accessibility/OWebContentsAccessibility.java", "java/src/org/chromium/content/browser/accessibility/OWebContentsAccessibility.java",
"java/src/org/chromium/content/browser/accessibility/WebContentsAccessibilityImpl.java", "java/src/org/chromium/content/browser/accessibility/WebContentsAccessibilityImpl.java",
"java/src/org/chromium/content/browser/accessibility/BrowserAccessibilityState.java",
"java/src/org/chromium/content/browser/accessibility/captioning/CaptioningBridgeFactory.java", "java/src/org/chromium/content/browser/accessibility/captioning/CaptioningBridgeFactory.java",
"java/src/org/chromium/content/browser/accessibility/captioning/CaptioningChangeDelegate.java", "java/src/org/chromium/content/browser/accessibility/captioning/CaptioningChangeDelegate.java",
"java/src/org/chromium/content/browser/accessibility/captioning/CaptioningController.java", "java/src/org/chromium/content/browser/accessibility/captioning/CaptioningController.java",
...@@ -244,22 +244,23 @@ android_library("content_java") { ...@@ -244,22 +244,23 @@ android_library("content_java") {
"java/src/org/chromium/content/common/ContentSwitchUtils.java", "java/src/org/chromium/content/common/ContentSwitchUtils.java",
"java/src/org/chromium/content/common/ServiceManagerConnectionImpl.java", "java/src/org/chromium/content/common/ServiceManagerConnectionImpl.java",
"java/src/org/chromium/content/common/SurfaceWrapper.java", "java/src/org/chromium/content/common/SurfaceWrapper.java",
"java/src/org/chromium/content_public/app/ChildProcessServiceFactory.java",
"java/src/org/chromium/content_public/browser/AccessibilitySnapshotCallback.java", "java/src/org/chromium/content_public/browser/AccessibilitySnapshotCallback.java",
"java/src/org/chromium/content_public/browser/AccessibilitySnapshotNode.java", "java/src/org/chromium/content_public/browser/AccessibilitySnapshotNode.java",
"java/src/org/chromium/content_public/browser/ActionModeCallbackHelper.java", "java/src/org/chromium/content_public/browser/ActionModeCallbackHelper.java",
"java/src/org/chromium/content_public/browser/BrowserStartupController.java", "java/src/org/chromium/content_public/browser/BrowserStartupController.java",
"java/src/org/chromium/content_public/browser/BrowserTaskExecutor.java", "java/src/org/chromium/content_public/browser/BrowserTaskExecutor.java",
"java/src/org/chromium/content_public/browser/ChildProcessCreationParams.java",
"java/src/org/chromium/content_public/browser/ChildProcessLauncherHelper.java",
"java/src/org/chromium/content_public/browser/ContentFeatureList.java", "java/src/org/chromium/content_public/browser/ContentFeatureList.java",
"java/src/org/chromium/content_public/browser/ContentViewStatics.java", "java/src/org/chromium/content_public/browser/ContentViewStatics.java",
"java/src/org/chromium/content_public/browser/DeviceUtils.java", "java/src/org/chromium/content_public/browser/DeviceUtils.java",
"java/src/org/chromium/content_public/browser/InputMethodManagerWrapper.java",
"java/src/org/chromium/content_public/browser/ChildProcessCreationParams.java",
"java/src/org/chromium/content_public/browser/ChildProcessLauncherHelper.java",
"java/src/org/chromium/content_public/browser/GestureListenerManager.java", "java/src/org/chromium/content_public/browser/GestureListenerManager.java",
"java/src/org/chromium/content_public/browser/GestureStateListener.java", "java/src/org/chromium/content_public/browser/GestureStateListener.java",
"java/src/org/chromium/content_public/browser/ImageDownloadCallback.java", "java/src/org/chromium/content_public/browser/ImageDownloadCallback.java",
"java/src/org/chromium/content_public/browser/ImeAdapter.java", "java/src/org/chromium/content_public/browser/ImeAdapter.java",
"java/src/org/chromium/content_public/browser/ImeEventObserver.java", "java/src/org/chromium/content_public/browser/ImeEventObserver.java",
"java/src/org/chromium/content_public/browser/InputMethodManagerWrapper.java",
"java/src/org/chromium/content_public/browser/InterfaceRegistrar.java", "java/src/org/chromium/content_public/browser/InterfaceRegistrar.java",
"java/src/org/chromium/content_public/browser/JavaScriptCallback.java", "java/src/org/chromium/content_public/browser/JavaScriptCallback.java",
"java/src/org/chromium/content_public/browser/JavascriptInjector.java", "java/src/org/chromium/content_public/browser/JavascriptInjector.java",
...@@ -298,7 +299,6 @@ android_library("content_java") { ...@@ -298,7 +299,6 @@ android_library("content_java") {
"java/src/org/chromium/content_public/common/ScreenOrientationConstants.java", "java/src/org/chromium/content_public/common/ScreenOrientationConstants.java",
"java/src/org/chromium/content_public/common/ServiceManagerConnection.java", "java/src/org/chromium/content_public/common/ServiceManagerConnection.java",
"java/src/org/chromium/content_public/common/UseZoomForDSFPolicy.java", "java/src/org/chromium/content_public/common/UseZoomForDSFPolicy.java",
"java/src/org/chromium/content_public/app/ChildProcessServiceFactory.java",
] ]
annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ] annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
} }
...@@ -443,11 +443,11 @@ android_library("content_javatests") { ...@@ -443,11 +443,11 @@ android_library("content_javatests") {
"//ui/gfx/geometry/mojom:mojom_java", "//ui/gfx/geometry/mojom:mojom_java",
] ]
java_files = [ sources = [
"javatests/src/org/chromium/content/browser/BrowserStartupControllerTest.java", "javatests/src/org/chromium/content/browser/BrowserStartupControllerTest.java",
"javatests/src/org/chromium/content/browser/ChildProcessLauncherHelperTest.java",
"javatests/src/org/chromium/content/browser/ChildProcessLauncherIntegrationTest.java", "javatests/src/org/chromium/content/browser/ChildProcessLauncherIntegrationTest.java",
"javatests/src/org/chromium/content/browser/ChildProcessLauncherTest.java", "javatests/src/org/chromium/content/browser/ChildProcessLauncherTest.java",
"javatests/src/org/chromium/content/browser/ChildProcessLauncherHelperTest.java",
"javatests/src/org/chromium/content/browser/ClipboardTest.java", "javatests/src/org/chromium/content/browser/ClipboardTest.java",
"javatests/src/org/chromium/content/browser/ContentCommandLineTest.java", "javatests/src/org/chromium/content/browser/ContentCommandLineTest.java",
"javatests/src/org/chromium/content/browser/ContentTextSelectionTest.java", "javatests/src/org/chromium/content/browser/ContentTextSelectionTest.java",
...@@ -472,9 +472,9 @@ android_library("content_javatests") { ...@@ -472,9 +472,9 @@ android_library("content_javatests") {
"javatests/src/org/chromium/content/browser/ScreenOrientationListenerTest.java", "javatests/src/org/chromium/content/browser/ScreenOrientationListenerTest.java",
"javatests/src/org/chromium/content/browser/TestsJavaScriptEvalTest.java", "javatests/src/org/chromium/content/browser/TestsJavaScriptEvalTest.java",
"javatests/src/org/chromium/content/browser/TracingControllerAndroidImplTest.java", "javatests/src/org/chromium/content/browser/TracingControllerAndroidImplTest.java",
"javatests/src/org/chromium/content/browser/VSyncPausedTest.java",
"javatests/src/org/chromium/content/browser/VideoFullscreenOrientationLockTest.java", "javatests/src/org/chromium/content/browser/VideoFullscreenOrientationLockTest.java",
"javatests/src/org/chromium/content/browser/VideoRotateToFullscreenTest.java", "javatests/src/org/chromium/content/browser/VideoRotateToFullscreenTest.java",
"javatests/src/org/chromium/content/browser/VSyncPausedTest.java",
"javatests/src/org/chromium/content/browser/ViewportTest.java", "javatests/src/org/chromium/content/browser/ViewportTest.java",
"javatests/src/org/chromium/content/browser/WakeLockTest.java", "javatests/src/org/chromium/content/browser/WakeLockTest.java",
"javatests/src/org/chromium/content/browser/WebContentsObserverAndroidTest.java", "javatests/src/org/chromium/content/browser/WebContentsObserverAndroidTest.java",
...@@ -513,13 +513,13 @@ android_library("content_javatests") { ...@@ -513,13 +513,13 @@ android_library("content_javatests") {
} }
junit_binary("content_junit_tests") { junit_binary("content_junit_tests") {
java_files = [ sources = [
"junit/src/org/chromium/content/browser/BindingManagerTest.java", "junit/src/org/chromium/content/browser/BindingManagerTest.java",
"junit/src/org/chromium/content/browser/ChildProcessRankingTest.java", "junit/src/org/chromium/content/browser/ChildProcessRankingTest.java",
"junit/src/org/chromium/content/browser/ScreenOrientationProviderImplTest.java", "junit/src/org/chromium/content/browser/ScreenOrientationProviderImplTest.java",
"junit/src/org/chromium/content/browser/SpareChildConnectionTest.java",
"junit/src/org/chromium/content/browser/UiThreadTaskTraitsImplTest.java", "junit/src/org/chromium/content/browser/UiThreadTaskTraitsImplTest.java",
"junit/src/org/chromium/content/browser/accessibility/BrowserAccessibilityStateTest.java", "junit/src/org/chromium/content/browser/accessibility/BrowserAccessibilityStateTest.java",
"junit/src/org/chromium/content/browser/SpareChildConnectionTest.java",
"junit/src/org/chromium/content/browser/androidoverlay/DialogOverlayCoreTest.java", "junit/src/org/chromium/content/browser/androidoverlay/DialogOverlayCoreTest.java",
"junit/src/org/chromium/content/browser/input/RangeTest.java", "junit/src/org/chromium/content/browser/input/RangeTest.java",
"junit/src/org/chromium/content/browser/input/TextInputStateTest.java", "junit/src/org/chromium/content/browser/input/TextInputStateTest.java",
......
...@@ -13,7 +13,9 @@ android_library("android_test_message_pump_support_java") { ...@@ -13,7 +13,9 @@ android_library("android_test_message_pump_support_java") {
deps = [ deps = [
"//base:base_java", "//base:base_java",
] ]
java_files = [ "javatests/src/org/chromium/content_public/browser/test/NestedSystemMessageHandler.java" ] sources = [
"javatests/src/org/chromium/content_public/browser/test/NestedSystemMessageHandler.java",
]
} }
android_library("content_java_test_support") { android_library("content_java_test_support") {
...@@ -28,7 +30,7 @@ android_library("content_java_test_support") { ...@@ -28,7 +30,7 @@ android_library("content_java_test_support") {
"//ui/android:ui_java", "//ui/android:ui_java",
"//ui/android:ui_java_test_support", "//ui/android:ui_java_test_support",
] ]
java_files = [ sources = [
"javatests/src/org/chromium/content_public/browser/test/ChildProcessAllocatorSettings.java", "javatests/src/org/chromium/content_public/browser/test/ChildProcessAllocatorSettings.java",
"javatests/src/org/chromium/content_public/browser/test/ChildProcessAllocatorSettingsHook.java", "javatests/src/org/chromium/content_public/browser/test/ChildProcessAllocatorSettingsHook.java",
"javatests/src/org/chromium/content_public/browser/test/ContentJUnit4ClassRunner.java", "javatests/src/org/chromium/content_public/browser/test/ContentJUnit4ClassRunner.java",
...@@ -44,10 +46,10 @@ android_library("content_java_test_support") { ...@@ -44,10 +46,10 @@ android_library("content_java_test_support") {
"javatests/src/org/chromium/content_public/browser/test/util/Criteria.java", "javatests/src/org/chromium/content_public/browser/test/util/Criteria.java",
"javatests/src/org/chromium/content_public/browser/test/util/CriteriaHelper.java", "javatests/src/org/chromium/content_public/browser/test/util/CriteriaHelper.java",
"javatests/src/org/chromium/content_public/browser/test/util/DOMUtils.java", "javatests/src/org/chromium/content_public/browser/test/util/DOMUtils.java",
"javatests/src/org/chromium/content_public/browser/test/util/DomAutomationController.java",
"javatests/src/org/chromium/content_public/browser/test/util/EqualityCriteria.java", "javatests/src/org/chromium/content_public/browser/test/util/EqualityCriteria.java",
"javatests/src/org/chromium/content_public/browser/test/util/HistoryUtils.java", "javatests/src/org/chromium/content_public/browser/test/util/HistoryUtils.java",
"javatests/src/org/chromium/content_public/browser/test/util/JavaScriptUtils.java", "javatests/src/org/chromium/content_public/browser/test/util/JavaScriptUtils.java",
"javatests/src/org/chromium/content_public/browser/test/util/DomAutomationController.java",
"javatests/src/org/chromium/content_public/browser/test/util/KeyUtils.java", "javatests/src/org/chromium/content_public/browser/test/util/KeyUtils.java",
"javatests/src/org/chromium/content_public/browser/test/util/RenderProcessLimit.java", "javatests/src/org/chromium/content_public/browser/test/util/RenderProcessLimit.java",
"javatests/src/org/chromium/content_public/browser/test/util/TestCallbackHelperContainer.java", "javatests/src/org/chromium/content_public/browser/test/util/TestCallbackHelperContainer.java",
......
...@@ -86,7 +86,7 @@ android_library("content_shell_java") { ...@@ -86,7 +86,7 @@ android_library("content_shell_java") {
"//net/android:net_java", "//net/android:net_java",
"//ui/android:ui_java", "//ui/android:ui_java",
] ]
java_files = [ sources = [
"java/src/org/chromium/content_shell/Shell.java", "java/src/org/chromium/content_shell/Shell.java",
"java/src/org/chromium/content_shell/ShellManager.java", "java/src/org/chromium/content_shell/ShellManager.java",
"java/src/org/chromium/content_shell/ShellViewAndroidDelegate.java", "java/src/org/chromium/content_shell/ShellViewAndroidDelegate.java",
...@@ -138,7 +138,7 @@ android_library("content_shell_apk_java") { ...@@ -138,7 +138,7 @@ android_library("content_shell_apk_java") {
"//ui/android:ui_java", "//ui/android:ui_java",
] ]
java_files = [ sources = [
"shell_apk/src/org/chromium/content_shell_apk/ChildProcessLauncherTestHelperService.java", "shell_apk/src/org/chromium/content_shell_apk/ChildProcessLauncherTestHelperService.java",
"shell_apk/src/org/chromium/content_shell_apk/ChildProcessLauncherTestUtils.java", "shell_apk/src/org/chromium/content_shell_apk/ChildProcessLauncherTestUtils.java",
"shell_apk/src/org/chromium/content_shell_apk/ContentShellActivity.java", "shell_apk/src/org/chromium/content_shell_apk/ContentShellActivity.java",
...@@ -247,10 +247,10 @@ android_library("content_shell_test_java") { ...@@ -247,10 +247,10 @@ android_library("content_shell_test_java") {
"//third_party/junit:junit", "//third_party/junit:junit",
"//ui/android:ui_java", "//ui/android:ui_java",
] ]
java_files = [ sources = [
"javatests/src/org/chromium/content_shell_apk/ContentShellActivityTestRule.java",
"javatests/src/org/chromium/content_shell_apk/ContentShellPreconditionsTest.java", "javatests/src/org/chromium/content_shell_apk/ContentShellPreconditionsTest.java",
"javatests/src/org/chromium/content_shell_apk/ContentShellShellManagementTest.java", "javatests/src/org/chromium/content_shell_apk/ContentShellShellManagementTest.java",
"javatests/src/org/chromium/content_shell_apk/ContentShellActivityTestRule.java",
"javatests/src/org/chromium/content_shell_apk/ContentShellUrlTest.java", "javatests/src/org/chromium/content_shell_apk/ContentShellUrlTest.java",
] ]
} }
...@@ -296,7 +296,7 @@ if (current_cpu != "x64") { ...@@ -296,7 +296,7 @@ if (current_cpu != "x64") {
use_chromium_linker = true use_chromium_linker = true
enable_chromium_linker_tests = true enable_chromium_linker_tests = true
jni_registration_header = _linker_test_jni_registration_header jni_registration_header = _linker_test_jni_registration_header
java_files = [ sources = [
"linker_test_apk/src/org/chromium/chromium_linker_test_apk/ChromiumLinkerTestActivity.java", "linker_test_apk/src/org/chromium/chromium_linker_test_apk/ChromiumLinkerTestActivity.java",
"linker_test_apk/src/org/chromium/chromium_linker_test_apk/ChromiumLinkerTestApplication.java", "linker_test_apk/src/org/chromium/chromium_linker_test_apk/ChromiumLinkerTestApplication.java",
"linker_test_apk/src/org/chromium/chromium_linker_test_apk/LinkerTests.java", "linker_test_apk/src/org/chromium/chromium_linker_test_apk/LinkerTests.java",
...@@ -367,5 +367,7 @@ android_library("content_shell_browsertests_java") { ...@@ -367,5 +367,7 @@ android_library("content_shell_browsertests_java") {
"//third_party/android_deps:com_android_support_support_compat_java", "//third_party/android_deps:com_android_support_support_compat_java",
"//ui/android:ui_java", "//ui/android:ui_java",
] ]
java_files = [ "browsertests/src/org/chromium/content_shell/browsertests/ContentShellBrowserTestActivity.java" ] sources = [
"browsertests/src/org/chromium/content_shell/browsertests/ContentShellBrowserTestActivity.java",
]
} }
...@@ -777,7 +777,7 @@ if (is_android) { ...@@ -777,7 +777,7 @@ if (is_android) {
android_library("content_browsertests_java") { android_library("content_browsertests_java") {
testonly = true testonly = true
java_files = [ sources = [
"../shell/android/browsertests_apk/src/org/chromium/content_browsertests_apk/ContentBrowserTestsActivity.java", "../shell/android/browsertests_apk/src/org/chromium/content_browsertests_apk/ContentBrowserTestsActivity.java",
"../shell/android/browsertests_apk/src/org/chromium/content_browsertests_apk/ContentBrowserTestsApplication.java", "../shell/android/browsertests_apk/src/org/chromium/content_browsertests_apk/ContentBrowserTestsApplication.java",
] ]
...@@ -2329,7 +2329,7 @@ if (is_android) { ...@@ -2329,7 +2329,7 @@ if (is_android) {
android_library("content_unittests_java") { android_library("content_unittests_java") {
testonly = true testonly = true
java_files = content_java_sources_needing_jni sources = content_java_sources_needing_jni
deps = [ deps = [
"$google_play_services_package:google_play_services_auth_api_phone_java", "$google_play_services_package:google_play_services_auth_api_phone_java",
"$google_play_services_package:google_play_services_base_java", "$google_play_services_package:google_play_services_base_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