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

Replace java_files with sources in //weblayer

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

TBR=alexclarke@chromium.org

Bug: 1035074
Change-Id: I791a807262f2e03186776a7fbcfa1f3aeba3f93c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1980903Reviewed-by: default avatarNatalie Chouinard <chouinard@chromium.org>
Commit-Queue: Natalie Chouinard <chouinard@chromium.org>
Cr-Commit-Position: refs/heads/master@{#727220}
parent 6ec11862
...@@ -7,7 +7,7 @@ import("//build/config/android/rules.gni") ...@@ -7,7 +7,7 @@ import("//build/config/android/rules.gni")
android_library("weblayer_java_tests") { android_library("weblayer_java_tests") {
testonly = true testonly = true
java_files = [ sources = [
"src/org/chromium/weblayer/test/BrowserFragmentLifecycleTest.java", "src/org/chromium/weblayer/test/BrowserFragmentLifecycleTest.java",
"src/org/chromium/weblayer/test/CrashReporterTest.java", "src/org/chromium/weblayer/test/CrashReporterTest.java",
"src/org/chromium/weblayer/test/DataClearingTest.java", "src/org/chromium/weblayer/test/DataClearingTest.java",
...@@ -17,7 +17,6 @@ android_library("weblayer_java_tests") { ...@@ -17,7 +17,6 @@ android_library("weblayer_java_tests") {
"src/org/chromium/weblayer/test/ExecuteScriptTest.java", "src/org/chromium/weblayer/test/ExecuteScriptTest.java",
"src/org/chromium/weblayer/test/FullscreenCallbackTest.java", "src/org/chromium/weblayer/test/FullscreenCallbackTest.java",
"src/org/chromium/weblayer/test/InputTypesTest.java", "src/org/chromium/weblayer/test/InputTypesTest.java",
"src/org/chromium/weblayer/test/WebLayerJUnit4ClassRunner.java",
"src/org/chromium/weblayer/test/InstrumentationActivityTestRule.java", "src/org/chromium/weblayer/test/InstrumentationActivityTestRule.java",
"src/org/chromium/weblayer/test/NavigationTest.java", "src/org/chromium/weblayer/test/NavigationTest.java",
"src/org/chromium/weblayer/test/NavigationWaiter.java", "src/org/chromium/weblayer/test/NavigationWaiter.java",
...@@ -29,6 +28,7 @@ android_library("weblayer_java_tests") { ...@@ -29,6 +28,7 @@ android_library("weblayer_java_tests") {
"src/org/chromium/weblayer/test/TabCallbackTest.java", "src/org/chromium/weblayer/test/TabCallbackTest.java",
"src/org/chromium/weblayer/test/TabListCallbackTest.java", "src/org/chromium/weblayer/test/TabListCallbackTest.java",
"src/org/chromium/weblayer/test/TopControlsTest.java", "src/org/chromium/weblayer/test/TopControlsTest.java",
"src/org/chromium/weblayer/test/WebLayerJUnit4ClassRunner.java",
"src/org/chromium/weblayer/test/WebLayerLoadingTest.java", "src/org/chromium/weblayer/test/WebLayerLoadingTest.java",
] ]
deps = [ deps = [
......
...@@ -24,7 +24,7 @@ java_cpp_enum("generated_enums") { ...@@ -24,7 +24,7 @@ java_cpp_enum("generated_enums") {
} }
android_library("java") { android_library("java") {
java_files = [ sources = [
"org/chromium/weblayer_private/ActionModeCallback.java", "org/chromium/weblayer_private/ActionModeCallback.java",
"org/chromium/weblayer_private/BrowserFragmentImpl.java", "org/chromium/weblayer_private/BrowserFragmentImpl.java",
"org/chromium/weblayer_private/BrowserImpl.java", "org/chromium/weblayer_private/BrowserImpl.java",
...@@ -108,7 +108,7 @@ generate_jni("jni") { ...@@ -108,7 +108,7 @@ generate_jni("jni") {
} }
android_library("interfaces_java") { android_library("interfaces_java") {
java_files = [ sources = [
"org/chromium/weblayer_private/interfaces/APICallException.java", "org/chromium/weblayer_private/interfaces/APICallException.java",
"org/chromium/weblayer_private/interfaces/BrowserFragmentArgs.java", "org/chromium/weblayer_private/interfaces/BrowserFragmentArgs.java",
"org/chromium/weblayer_private/interfaces/BrowsingDataType.java", "org/chromium/weblayer_private/interfaces/BrowsingDataType.java",
...@@ -130,7 +130,7 @@ android_library("interfaces_java") { ...@@ -130,7 +130,7 @@ android_library("interfaces_java") {
# java classes. It compiles the abstract class; implementations are compiled # java classes. It compiles the abstract class; implementations are compiled
# separately. # separately.
android_library("gms_bridge_java") { android_library("gms_bridge_java") {
java_files = [ sources = [
"org/chromium/weblayer_private/GmsBridge.java", "org/chromium/weblayer_private/GmsBridge.java",
"org/chromium/weblayer_private/GmsBridgeImpl.java", "org/chromium/weblayer_private/GmsBridgeImpl.java",
] ]
...@@ -146,7 +146,9 @@ android_library("gms_bridge_java") { ...@@ -146,7 +146,9 @@ android_library("gms_bridge_java") {
# This target compiles the implementation of GmsBridge for public targets. # This target compiles the implementation of GmsBridge for public targets.
android_library("gms_bridge_upstream_impl_java") { android_library("gms_bridge_upstream_impl_java") {
java_files = [ "org/chromium/weblayer_private/GmsBridgeImpl.java" ] sources = [
"org/chromium/weblayer_private/GmsBridgeImpl.java",
]
deps = [ deps = [
":gms_bridge_java", ":gms_bridge_java",
] ]
......
...@@ -24,7 +24,7 @@ android_resources("client_resources") { ...@@ -24,7 +24,7 @@ android_resources("client_resources") {
} }
android_library("java") { android_library("java") {
java_files = [ sources = [
"org/chromium/weblayer/Browser.java", "org/chromium/weblayer/Browser.java",
"org/chromium/weblayer/BrowserFragment.java", "org/chromium/weblayer/BrowserFragment.java",
"org/chromium/weblayer/BrowsingDataType.java", "org/chromium/weblayer/BrowsingDataType.java",
......
...@@ -7,7 +7,9 @@ import("//build/config/android/rules.gni") ...@@ -7,7 +7,9 @@ import("//build/config/android/rules.gni")
android_library("weblayer_public_javatests") { android_library("weblayer_public_javatests") {
testonly = true testonly = true
java_files = [ "org/chromium/weblayer/ObserverListTest.java" ] sources = [
"org/chromium/weblayer/ObserverListTest.java",
]
deps = [ deps = [
"//base:base_java_test_support", "//base:base_java_test_support",
"//third_party/junit:junit", "//third_party/junit:junit",
......
...@@ -34,7 +34,7 @@ android_library("weblayer_shell_java") { ...@@ -34,7 +34,7 @@ android_library("weblayer_shell_java") {
"//third_party/android_deps:android_support_v4_java", "//third_party/android_deps:android_support_v4_java",
"//weblayer/public/java", "//weblayer/public/java",
] ]
java_files = [ sources = [
"shell_apk/src/org/chromium/weblayer/shell/InstrumentationActivity.java", "shell_apk/src/org/chromium/weblayer/shell/InstrumentationActivity.java",
"shell_apk/src/org/chromium/weblayer/shell/WebLayerShellActivity.java", "shell_apk/src/org/chromium/weblayer/shell/WebLayerShellActivity.java",
] ]
......
...@@ -23,7 +23,7 @@ if (is_android) { ...@@ -23,7 +23,7 @@ if (is_android) {
android_library("weblayer_browsertests_java") { android_library("weblayer_browsertests_java") {
testonly = true testonly = true
java_files = [ sources = [
"../shell/android/browsertests_apk/src/org/chromium/weblayer_browsertests_apk/WebLayerBrowserTestsActivity.java", "../shell/android/browsertests_apk/src/org/chromium/weblayer_browsertests_apk/WebLayerBrowserTestsActivity.java",
"../shell/android/browsertests_apk/src/org/chromium/weblayer_browsertests_apk/WebLayerBrowserTestsApplication.java", "../shell/android/browsertests_apk/src/org/chromium/weblayer_browsertests_apk/WebLayerBrowserTestsApplication.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