Commit 5a0d7d03 authored by Natalie Chouinard's avatar Natalie Chouinard Committed by Commit Bot

Replace java_files with sources in //chrome/browser

Replace usages of java_files with sources in all //chrome/browser
BUILD.gn files, and automatically format.

TBR=yfriedman@chromium.org

Bug: 1035074
Change-Id: I50923d85e311ba9b072684beb2d0099910903005
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1973236
Commit-Queue: Natalie Chouinard <chouinard@chromium.org>
Reviewed-by: default avatarGang Wu <gangwu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#727023}
parent 83ee7dad
......@@ -5,7 +5,7 @@
if (is_android) {
import("//build/config/android/rules.gni")
_jni_java_files = [ "javatests/src/org/chromium/chrome/browser/metrics/util/UkmUtilsForTest.java" ]
_jni_sources = [ "javatests/src/org/chromium/chrome/browser/metrics/util/UkmUtilsForTest.java" ]
static_library("ukm_utils_for_test") {
testonly = true
......@@ -22,12 +22,12 @@ if (is_android) {
generate_jni("jni_headers") {
testonly = true
sources = _jni_java_files
sources = _jni_sources
}
android_library("ukm_java_test_support") {
testonly = true
java_files = _jni_java_files
sources = _jni_sources
deps = [
"//base:base_java",
]
......@@ -35,8 +35,9 @@ if (is_android) {
android_library("ukm_javatests") {
testonly = true
java_files =
[ "javatests/src/org/chromium/chrome/browser/metrics/UkmTest.java" ]
sources = [
"javatests/src/org/chromium/chrome/browser/metrics/UkmTest.java",
]
deps = [
":ukm_java_test_support",
......
......@@ -15,7 +15,7 @@ source_set("thin_webview") {
}
android_library("java") {
java_files = [
sources = [
"java/src/org/chromium/chrome/browser/thinwebview/CompositorView.java",
"java/src/org/chromium/chrome/browser/thinwebview/ThinWebView.java",
"java/src/org/chromium/chrome/browser/thinwebview/ThinWebViewConstraints.java",
......@@ -29,7 +29,7 @@ android_library("java") {
}
android_library("factory_java") {
java_files = [
sources = [
"java/src/org/chromium/chrome/browser/thinwebview/CompositorViewFactory.java",
"java/src/org/chromium/chrome/browser/thinwebview/ThinWebViewFactory.java",
]
......
......@@ -28,7 +28,7 @@ static_library("internal") {
}
android_library("internal_java") {
java_files = [
sources = [
"java/src/org/chromium/chrome/browser/thinwebview/internal/CompositorViewImpl.java",
"java/src/org/chromium/chrome/browser/thinwebview/internal/ThinWebViewImpl.java",
]
......
......@@ -205,7 +205,9 @@ android_library("ar_java") {
"//third_party/arcore-android-sdk-client:com_google_ar_core_java",
]
java_files = [ "//chrome/android/java/src/org/chromium/chrome/browser/vr/ArCoreShimImpl.java" ]
sources = [
"//chrome/android/java/src/org/chromium/chrome/browser/vr/ArCoreShimImpl.java",
]
}
if (enable_arcore) {
......
......@@ -5,7 +5,7 @@
import("//build/config/android/rules.gni")
android_library("java") {
java_files = [
sources = [
"java/src/org/chromium/chrome/browser/download/DirectoryOption.java",
"java/src/org/chromium/chrome/browser/download/DownloadConstants.java",
"java/src/org/chromium/chrome/browser/download/DownloadDirectoryProvider.java",
......@@ -13,9 +13,9 @@ android_library("java") {
"java/src/org/chromium/chrome/browser/download/DownloadFilter.java",
"java/src/org/chromium/chrome/browser/download/DownloadInfo.java",
"java/src/org/chromium/chrome/browser/download/DownloadManagerBridge.java",
"java/src/org/chromium/chrome/browser/download/DownloadStartupUtils.java",
"java/src/org/chromium/chrome/browser/download/DownloadStatus.java",
"java/src/org/chromium/chrome/browser/download/MediaStoreHelper.java",
"java/src/org/chromium/chrome/browser/download/DownloadStartupUtils.java",
"java/src/org/chromium/chrome/browser/download/MimeUtils.java",
"java/src/org/chromium/chrome/browser/download/UriUtils.java",
]
......@@ -45,9 +45,9 @@ generate_jni("jni_headers") {
android_library("download_java_tests") {
testonly = true
java_files = [
"javatests/src/org/chromium/chrome/browser/download/MimeUtilsTest.java",
sources = [
"javatests/src/org/chromium/chrome/browser/download/DownloadFileProviderTest.java",
"javatests/src/org/chromium/chrome/browser/download/MimeUtilsTest.java",
]
deps = [
......
......@@ -7,7 +7,9 @@ import("//build/config/android/rules.gni")
# Upstream ImageEditor implementation which does nothing. Actual implementation
# lives downstream.
android_library("java") {
java_files = [ "android/java/src/org/chromium/chrome/browser/image_editor/ImageEditorDialogCoordinatorImpl.java" ]
sources = [
"android/java/src/org/chromium/chrome/browser/image_editor/ImageEditorDialogCoordinatorImpl.java",
]
deps = [
"//chrome/browser/image_editor/public:java",
......
......@@ -5,7 +5,9 @@
import("//build/config/android/rules.gni")
android_library("java") {
java_files = [ "android/java/src/org/chromium/chrome/browser/image_editor/ImageEditorDialogCoordinator.java" ]
sources = [
"android/java/src/org/chromium/chrome/browser/image_editor/ImageEditorDialogCoordinator.java",
]
deps = [
"//third_party/android_deps:android_support_v7_appcompat_java",
......
......@@ -14,11 +14,11 @@ android_library("java") {
"//third_party/gif_player:gif_player_java",
]
annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
java_files = [
sources = [
"android/java/src/org/chromium/chrome/browser/image_fetcher/CachedImageFetcher.java",
"android/java/src/org/chromium/chrome/browser/image_fetcher/ImageFetcher.java",
"android/java/src/org/chromium/chrome/browser/image_fetcher/ImageFetcherBridge.java",
"android/java/src/org/chromium/chrome/browser/image_fetcher/ImageFetcherFactory.java",
"android/java/src/org/chromium/chrome/browser/image_fetcher/ImageFetcher.java",
"android/java/src/org/chromium/chrome/browser/image_fetcher/InMemoryCachedImageFetcher.java",
"android/java/src/org/chromium/chrome/browser/image_fetcher/NetworkImageFetcher.java",
]
......
......@@ -5,7 +5,9 @@
import("//build/config/android/rules.gni")
android_library("java") {
java_files = [ "java/src/org/chromium/chrome/browser/notifications/chime/ChimeSession.java" ]
sources = [
"java/src/org/chromium/chrome/browser/notifications/chime/ChimeSession.java",
]
annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
......
......@@ -5,7 +5,7 @@
import("//build/config/android/rules.gni")
android_library("java") {
java_files = [
sources = [
"android/java/src/org/chromium/chrome/browser/preferences/BaseChromePreferenceKeyChecker.java",
"android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeyChecker.java",
"android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java",
......@@ -39,7 +39,7 @@ java_library("preferences_junit_tests") {
# Skip platform checks since Robolectric depends on requires_android targets.
bypass_platform_checks = true
testonly = true
java_files = [
sources = [
"android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeyCheckerTest.java",
"android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeysTest.java",
"android/java/src/org/chromium/chrome/browser/preferences/KeyPrefixTest.java",
......
......@@ -15,7 +15,9 @@ if (is_android) {
android_library("subresource_filter_java_test_support") {
testonly = true
java_files = [ "../../android/javatests/src/org/chromium/chrome/browser/subresource_filter/TestRulesetPublisher.java" ]
sources = [
"../../android/javatests/src/org/chromium/chrome/browser/subresource_filter/TestRulesetPublisher.java",
]
deps = [
"//base:base_java",
]
......@@ -23,7 +25,9 @@ if (is_android) {
android_library("subresource_filter_javatests") {
testonly = true
java_files = [ "../../android/javatests/src/org/chromium/chrome/browser/subresource_filter/SubresourceFilterTest.java" ]
sources = [
"../../android/javatests/src/org/chromium/chrome/browser/subresource_filter/SubresourceFilterTest.java",
]
deps = [
":subresource_filter_java_test_support",
"//base:base_java_test_support",
......
......@@ -35,16 +35,18 @@ android_library("public_java") {
"//ui/android:ui_java",
]
java_files = [
"java/src/org/chromium/chrome/browser/touch_to_fill/data/Credential.java",
sources = [
"java/src/org/chromium/chrome/browser/touch_to_fill/TouchToFillComponent.java",
"java/src/org/chromium/chrome/browser/touch_to_fill/data/Credential.java",
]
}
junit_binary("touch_to_fill_junit_tests") {
testonly = true
java_files = [ "junit/src/org/chromium/chrome/browser/touch_to_fill/TouchToFillControllerTest.java" ]
sources = [
"junit/src/org/chromium/chrome/browser/touch_to_fill/TouchToFillControllerTest.java",
]
deps = [
"//base:base_java_test_support",
......@@ -60,7 +62,7 @@ junit_binary("touch_to_fill_junit_tests") {
android_library("test_java") {
testonly = true
java_files = [
sources = [
"javatests/src/org/chromium/chrome/browser/touch_to_fill/TouchToFillIntegrationTest.java",
"javatests/src/org/chromium/chrome/browser/touch_to_fill/TouchToFillViewTest.java",
]
......
......@@ -20,7 +20,7 @@ android_library("java") {
"//ui/android:ui_java",
]
java_files = [
sources = [
"java/src/org/chromium/chrome/browser/touch_to_fill/TouchToFillBridge.java",
"java/src/org/chromium/chrome/browser/touch_to_fill/TouchToFillCoordinator.java",
"java/src/org/chromium/chrome/browser/touch_to_fill/TouchToFillMediator.java",
......
......@@ -5,7 +5,7 @@ import("//build/config/android/rules.gni")
import("//chrome/android/features/android_library_factory_tmpl.gni")
android_library("java") {
java_files = [
sources = [
"java/src/org/chromium/chrome/browser/ui/appmenu/AppMenuBlocker.java",
"java/src/org/chromium/chrome/browser/ui/appmenu/AppMenuButtonHelper.java",
"java/src/org/chromium/chrome/browser/ui/appmenu/AppMenuCoordinator.java",
......@@ -33,7 +33,7 @@ android_library_factory("factory_java") {
android_library("test_support_java") {
testonly = true
java_files = [
sources = [
"test/java/src/org/chromium/chrome/browser/ui/appmenu/AppMenuTestSupport.java",
"test/java/src/org/chromium/chrome/browser/ui/appmenu/TestAppMenuObserver.java",
]
......
......@@ -5,7 +5,7 @@
import("//build/config/android/rules.gni")
android_library("java") {
java_files = [
sources = [
"java/src/org/chromium/chrome/browser/ui/appmenu/AppMenu.java",
"java/src/org/chromium/chrome/browser/ui/appmenu/AppMenuAdapter.java",
"java/src/org/chromium/chrome/browser/ui/appmenu/AppMenuButtonHelperImpl.java",
......@@ -44,9 +44,9 @@ android_resources("java_resources") {
android_library("javatests") {
testonly = true
java_files = [
"java/src/org/chromium/chrome/browser/ui/appmenu/AppMenuAdapterTest.java",
sources = [
"java/src/org/chromium/chrome/browser/ui/appmenu/AppMenuAdapterRenderTest.java",
"java/src/org/chromium/chrome/browser/ui/appmenu/AppMenuAdapterTest.java",
"java/src/org/chromium/chrome/browser/ui/appmenu/AppMenuTest.java",
"java/src/org/chromium/chrome/browser/ui/appmenu/TestAppMenuDelegate.java",
"java/src/org/chromium/chrome/browser/ui/appmenu/TestAppMenuPropertiesDelegate.java",
......@@ -85,7 +85,9 @@ java_library("junit") {
# Skip platform checks since Robolectric depends on requires_android targets.
bypass_platform_checks = true
testonly = true
java_files = [ "java/src/org/chromium/chrome/browser/ui/appmenu/AppMenuPopupPositionTest.java" ]
sources = [
"java/src/org/chromium/chrome/browser/ui/appmenu/AppMenuPopupPositionTest.java",
]
deps = [
":java",
"//base:base_junit_test_support",
......
......@@ -6,7 +6,7 @@ import("//build/config/android/rules.gni")
import("//ui/android/features.gni")
android_library("java") {
java_files = [
sources = [
"java/src/org/chromium/chrome/browser/ui/widget/AlwaysDismissedDialog.java",
"java/src/org/chromium/chrome/browser/ui/widget/ClipDrawableProgressBar.java",
"java/src/org/chromium/chrome/browser/ui/widget/CompositeTouchDelegate.java",
......@@ -14,11 +14,11 @@ android_library("java") {
"java/src/org/chromium/chrome/browser/ui/widget/FadingShadow.java",
"java/src/org/chromium/chrome/browser/ui/widget/FadingShadowView.java",
"java/src/org/chromium/chrome/browser/ui/widget/LoadingView.java",
"java/src/org/chromium/chrome/browser/ui/widget/MaterialProgressBar.java",
"java/src/org/chromium/chrome/browser/ui/widget/MoreProgressButton.java",
"java/src/org/chromium/chrome/browser/ui/widget/PaddedFrameLayout.java",
"java/src/org/chromium/chrome/browser/ui/widget/PromoDialog.java",
"java/src/org/chromium/chrome/browser/ui/widget/PromoDialogLayout.java",
"java/src/org/chromium/chrome/browser/ui/widget/MaterialProgressBar.java",
"java/src/org/chromium/chrome/browser/ui/widget/MoreProgressButton.java",
"java/src/org/chromium/chrome/browser/ui/widget/RadioButtonLayout.java",
"java/src/org/chromium/chrome/browser/ui/widget/RadioButtonWithDescription.java",
"java/src/org/chromium/chrome/browser/ui/widget/RadioButtonWithDescriptionLayout.java",
......@@ -41,13 +41,13 @@ android_library("java") {
"java/src/org/chromium/chrome/browser/ui/widget/highlight/PulseDrawable.java",
"java/src/org/chromium/chrome/browser/ui/widget/highlight/PulseInterpolator.java",
"java/src/org/chromium/chrome/browser/ui/widget/highlight/ViewHighlighter.java",
"java/src/org/chromium/chrome/browser/ui/widget/listmenu/ListMenu.java",
"java/src/org/chromium/chrome/browser/ui/widget/listmenu/BasicListMenu.java",
"java/src/org/chromium/chrome/browser/ui/widget/listmenu/ListMenu.java",
"java/src/org/chromium/chrome/browser/ui/widget/listmenu/ListMenuButton.java",
"java/src/org/chromium/chrome/browser/ui/widget/listmenu/ListMenuButtonDelegate.java",
"java/src/org/chromium/chrome/browser/ui/widget/listmenu/ListMenuItemAdapter.java",
"java/src/org/chromium/chrome/browser/ui/widget/listmenu/ListMenuItemViewBinder.java",
"java/src/org/chromium/chrome/browser/ui/widget/listmenu/ListMenuItemProperties.java",
"java/src/org/chromium/chrome/browser/ui/widget/listmenu/ListMenuItemViewBinder.java",
"java/src/org/chromium/chrome/browser/ui/widget/text/AccessibleTextView.java",
"java/src/org/chromium/chrome/browser/ui/widget/text/TemplatePreservingTextView.java",
"java/src/org/chromium/chrome/browser/ui/widget/text/TextViewWithCompoundDrawables.java",
......@@ -87,7 +87,9 @@ android_resources("ui_widget_java_resources") {
android_library("test_support_java") {
testonly = true
java_files = [ "test/java/src/org/chromium/chrome/browser/ui/widget/highlight/ViewHighlighterTestUtils.java" ]
sources = [
"test/java/src/org/chromium/chrome/browser/ui/widget/highlight/ViewHighlighterTestUtils.java",
]
deps = [
":java",
"//content/public/test/android:content_java_test_support",
......@@ -97,13 +99,13 @@ android_library("test_support_java") {
android_library("ui_widget_java_tests") {
testonly = true
java_files = [
sources = [
"java/src/org/chromium/chrome/browser/ui/widget/MoreProgressButtonTest.java",
"java/src/org/chromium/chrome/browser/ui/widget/PromoDialogTest.java",
"java/src/org/chromium/chrome/browser/ui/widget/RadioButtonLayoutTest.java",
"java/src/org/chromium/chrome/browser/ui/widget/RadioButtonWithDescriptionLayoutTest.java",
"java/src/org/chromium/chrome/browser/ui/widget/highlight/ViewHighlighterTest.java",
"java/src/org/chromium/chrome/browser/ui/widget/MoreProgressButtonTest.java",
"java/src/org/chromium/chrome/browser/ui/widget/WrappingLayoutTest.java",
"java/src/org/chromium/chrome/browser/ui/widget/highlight/ViewHighlighterTest.java",
]
deps = [
":java",
......@@ -134,7 +136,9 @@ java_library("ui_widget_junit_tests") {
# Skip platform checks since Robolectric depends on requires_android targets.
bypass_platform_checks = true
testonly = true
java_files = [ "java/src/org/chromium/chrome/browser/ui/widget/CompositeTouchDelegateUnitTest.java" ]
sources = [
"java/src/org/chromium/chrome/browser/ui/widget/CompositeTouchDelegateUnitTest.java",
]
deps = [
":java",
"//base:base_java",
......
......@@ -5,7 +5,7 @@
import("//build/config/android/rules.gni")
android_library("java") {
java_files = [
sources = [
"android/java/src/org/chromium/chrome/browser/util/AccessibilityUtil.java",
"android/java/src/org/chromium/chrome/browser/util/AndroidTaskUtils.java",
"android/java/src/org/chromium/chrome/browser/util/BitmapCache.java",
......@@ -43,7 +43,7 @@ generate_jni("jni_headers") {
android_library("javatests") {
testonly = true
java_files = [
sources = [
"android/java/src/org/chromium/chrome/browser/util/ChromeFileProviderTest.java",
"android/java/src/org/chromium/chrome/browser/util/HashUtilTest.java",
"android/java/src/org/chromium/chrome/browser/util/UrlUtilitiesTest.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