Skip to content

GitLab

T
tangled
Commit 73f1202a authored by Natalie Chouinard's avatar Natalie Chouinard Committed by Commit Bot
Browse files
Options

Replace java_files with sources in //third_party 

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

TBR=dpranke@chromium.org

Bug: 1035074
Change-Id: I1ac9d292b68955a38757cf90f57631ff260b388a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1980893Reviewed-by: default avatarNatalie Chouinard <chouinard@chromium.org>
Commit-Queue: Natalie Chouinard <chouinard@chromium.org>
Cr-Commit-Position: refs/heads/master@{#727204}
parent d5173731
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 448 additions and 443 deletions
third_party/android_data_chart/BUILD.gn
View file @ 73f1202a
......@@ -12,7 +12,7 @@ android_resources("android_data_chart_java_resources") {
}
android_library("android_data_chart_java") {
java_files = [
sources = [
"java/src/org/chromium/third_party/android/datausagechart/ChartAxis.java",
"java/src/org/chromium/third_party/android/datausagechart/ChartDataUsageView.java",
"java/src/org/chromium/third_party/android/datausagechart/ChartNetworkSeriesView.java",
......
third_party/android_media/BUILD.gn
View file @ 73f1202a
......@@ -16,8 +16,9 @@ android_resources("android_media_resources") {
}
android_library("android_media_java") {
java_files =
[ "java/src/org/chromium/third_party/android/media/MediaController.java" ]
sources = [
"java/src/org/chromium/third_party/android/media/MediaController.java",
]
deps = [
":android_media_resources",
"//third_party/android_deps:android_support_v7_appcompat_java",
......
third_party/android_protobuf/BUILD.gn
View file @ 73f1202a
......@@ -147,7 +147,7 @@ if (is_android) {
android_library("protobuf_nano_javalib") {
chromium_code = false
java_files = [
sources = [
"src/java/src/device/main/java/com/google/protobuf/nano/android/ParcelableExtendableMessageNano.java",
"src/java/src/device/main/java/com/google/protobuf/nano/android/ParcelableMessageNano.java",
"src/java/src/device/main/java/com/google/protobuf/nano/android/ParcelableMessageNanoCreator.java",
......
third_party/android_sdk/BUILD.gn
View file @ 73f1202a
......@@ -65,7 +65,9 @@ if (enable_java_templates) {
android_library("android_support_chromium_java") {
testonly = true
java_files = [ "//third_party/android_sdk/public/extras/chromium/support/src/org/chromium/android/support/PackageManagerWrapper.java" ]
sources = [
"//third_party/android_sdk/public/extras/chromium/support/src/org/chromium/android/support/PackageManagerWrapper.java",
]
}
android_java_prebuilt("android_gcm_java") {
jar_path = "//third_party/android_sdk/public/extras/google/gcm/gcm-client/dist/gcm.jar"
......
third_party/android_sdk/androidx_browser/BUILD.gn
View file @ 73f1202a
......@@ -5,7 +5,7 @@
import("//build/config/android/rules.gni")
android_library("androidx_browser_java") {
java_files = [
sources = [
"./src/browser/src/main/java/androidx/browser/customtabs/CustomTabColorSchemeParams.java",
"./src/browser/src/main/java/androidx/browser/customtabs/CustomTabsCallback.java",
"./src/browser/src/main/java/androidx/browser/customtabs/CustomTabsClient.java",
......
third_party/android_swipe_refresh/BUILD.gn
View file @ 73f1202a
......@@ -8,7 +8,7 @@ assert(is_android)
android_library("android_swipe_refresh_java") {
chromium_code = false # Don't lint.
java_files = [
sources = [
"java/src/org/chromium/third_party/android/swiperefresh/CircleImageView.java",
"java/src/org/chromium/third_party/android/swiperefresh/MaterialProgressDrawable.java",
"java/src/org/chromium/third_party/android/swiperefresh/SwipeRefreshLayout.java",
......
third_party/cacheinvalidation/BUILD.gn
View file @ 73f1202a
......@@ -145,7 +145,7 @@ if (is_android) {
"//third_party/android_sdk:android_gcm_java",
]
java_files = [
sources = [
"src/java/com/google/ipc/invalidation/common/BaseCommonInvalidationConstants.java",
"src/java/com/google/ipc/invalidation/common/BuildConstants.java",
"src/java/com/google/ipc/invalidation/common/DigestFunction.java",
......
third_party/cct_dynamic_module/BUILD.gn
View file @ 73f1202a
......@@ -5,7 +5,7 @@
import("//build/config/android/rules.gni")
android_library("cct_dynamic_module_java") {
java_files = [
sources = [
"src/src/java/org/chromium/chrome/browser/customtabs/dynamicmodule/BaseActivityDelegate.java",
"src/src/java/org/chromium/chrome/browser/customtabs/dynamicmodule/BaseActivityHost.java",
"src/src/java/org/chromium/chrome/browser/customtabs/dynamicmodule/BaseModuleEntryPoint.java",
......
third_party/custom_tabs_client/BUILD.gn
View file @ 73f1202a
......@@ -20,7 +20,7 @@ android_resources("custom_tabs_support_resources") {
}
android_apk("custom_tabs_client_example_apk") {
java_files = [
sources = [
"src/Application/src/main/java/org/chromium/customtabsclient/BottomBarManager.java",
"src/Application/src/main/java/org/chromium/customtabsclient/BrowserActionsReceiver.java",
"src/Application/src/main/java/org/chromium/customtabsclient/MainActivity.java",
......@@ -42,11 +42,11 @@ android_apk("custom_tabs_client_example_apk") {
}
android_library("custom_tabs_client_shared_java") {
java_files = [
sources = [
"src/shared/src/main/java/org/chromium/customtabsclient/shared/CustomTabsHelper.java",
"src/shared/src/main/java/org/chromium/customtabsclient/shared/KeepAliveService.java",
"src/shared/src/main/java/org/chromium/customtabsclient/shared/ServiceConnectionCallback.java",
"src/shared/src/main/java/org/chromium/customtabsclient/shared/ServiceConnection.java",
"src/shared/src/main/java/org/chromium/customtabsclient/shared/ServiceConnectionCallback.java",
]
deps = [
......@@ -56,19 +56,8 @@ android_library("custom_tabs_client_shared_java") {
}
android_library("custom_tabs_support_java") {
java_files = [
"src/customtabs/src/android/support/customtabs/browseractions/BrowserActionItem.java",
"src/customtabs/src/android/support/customtabs/browseractions/BrowserActionsFallbackMenuAdapter.java",
"src/customtabs/src/android/support/customtabs/browseractions/BrowserActionsFallbackMenuDialog.java",
"src/customtabs/src/android/support/customtabs/browseractions/BrowserActionsFallbackMenuUi.java",
"src/customtabs/src/android/support/customtabs/browseractions/BrowserActionsFallbackMenuView.java",
"src/customtabs/src/android/support/customtabs/browseractions/BrowserActionsIntent.java",
"src/customtabs/src/android/support/customtabs/browseractions/BrowserServiceFileProvider.java",
"src/customtabs/src/android/support/customtabs/browseractions/BrowserServiceImageReadTask.java",
"src/customtabs/src/android/support/customtabs/trusted/TrustedWebActivityBuilder.java",
"src/customtabs/src/android/support/customtabs/trusted/TrustedWebActivityService.java",
"src/customtabs/src/android/support/customtabs/trusted/TrustedWebActivityServiceWrapper.java",
"src/customtabs/src/android/support/customtabs/trusted/TrustedWebActivityServiceConnectionManager.java",
sources = [
"src/customtabs/src/android/support/customtabs/CustomTabColorSchemeParams.java",
"src/customtabs/src/android/support/customtabs/CustomTabsCallback.java",
"src/customtabs/src/android/support/customtabs/CustomTabsClient.java",
"src/customtabs/src/android/support/customtabs/CustomTabsIntent.java",
......@@ -76,11 +65,22 @@ android_library("custom_tabs_support_java") {
"src/customtabs/src/android/support/customtabs/CustomTabsServiceConnection.java",
"src/customtabs/src/android/support/customtabs/CustomTabsSession.java",
"src/customtabs/src/android/support/customtabs/CustomTabsSessionToken.java",
"src/customtabs/src/android/support/customtabs/CustomTabColorSchemeParams.java",
"src/customtabs/src/android/support/customtabs/PostMessageBackend.java",
"src/customtabs/src/android/support/customtabs/PostMessageService.java",
"src/customtabs/src/android/support/customtabs/PostMessageServiceConnection.java",
"src/customtabs/src/android/support/customtabs/TrustedWebUtils.java",
"src/customtabs/src/android/support/customtabs/browseractions/BrowserActionItem.java",
"src/customtabs/src/android/support/customtabs/browseractions/BrowserActionsFallbackMenuAdapter.java",
"src/customtabs/src/android/support/customtabs/browseractions/BrowserActionsFallbackMenuDialog.java",
"src/customtabs/src/android/support/customtabs/browseractions/BrowserActionsFallbackMenuUi.java",
"src/customtabs/src/android/support/customtabs/browseractions/BrowserActionsFallbackMenuView.java",
"src/customtabs/src/android/support/customtabs/browseractions/BrowserActionsIntent.java",
"src/customtabs/src/android/support/customtabs/browseractions/BrowserServiceFileProvider.java",
"src/customtabs/src/android/support/customtabs/browseractions/BrowserServiceImageReadTask.java",
"src/customtabs/src/android/support/customtabs/trusted/TrustedWebActivityBuilder.java",
"src/customtabs/src/android/support/customtabs/trusted/TrustedWebActivityService.java",
"src/customtabs/src/android/support/customtabs/trusted/TrustedWebActivityServiceConnectionManager.java",
"src/customtabs/src/android/support/customtabs/trusted/TrustedWebActivityServiceWrapper.java",
]
deps = [
":custom_tabs_support_resources",
......
third_party/gif_player/BUILD.gn
View file @ 73f1202a
......@@ -5,7 +5,7 @@
import("//build/config/android/rules.gni")
android_library("gif_player_java") {
java_files = [
sources = [
"src/jp/tomorrowkey/android/gifplayer/BaseGifDrawable.java",
"src/jp/tomorrowkey/android/gifplayer/BaseGifImage.java",
]
......
third_party/jsr-305/BUILD.gn
View file @ 73f1202a
......@@ -2,37 +2,37 @@ import("//build/config/android/rules.gni")
java_library("jsr_305_javalib") {
supports_android = true
java_files = [
"src/ri/src/main/java/javax/annotation/PropertyKey.java",
sources = [
"src/ri/src/main/java/javax/annotation/CheckForNull.java",
"src/ri/src/main/java/javax/annotation/CheckForSigned.java",
"src/ri/src/main/java/javax/annotation/CheckReturnValue.java",
"src/ri/src/main/java/javax/annotation/Detainted.java",
"src/ri/src/main/java/javax/annotation/Untainted.java",
"src/ri/src/main/java/javax/annotation/Signed.java",
"src/ri/src/main/java/javax/annotation/MatchesPattern.java",
"src/ri/src/main/java/javax/annotation/Nonnegative.java",
"src/ri/src/main/java/javax/annotation/Nonnull.java",
"src/ri/src/main/java/javax/annotation/Nullable.java",
"src/ri/src/main/java/javax/annotation/ParametersAreNullableByDefault.java",
"src/ri/src/main/java/javax/annotation/OverridingMethodsMustInvokeSuper.java",
"src/ri/src/main/java/javax/annotation/Tainted.java",
"src/ri/src/main/java/javax/annotation/CheckReturnValue.java",
"src/ri/src/main/java/javax/annotation/Nonnegative.java",
"src/ri/src/main/java/javax/annotation/WillCloseWhenClosed.java",
"src/ri/src/main/java/javax/annotation/ParametersAreNonnullByDefault.java",
"src/ri/src/main/java/javax/annotation/ParametersAreNullableByDefault.java",
"src/ri/src/main/java/javax/annotation/PropertyKey.java",
"src/ri/src/main/java/javax/annotation/RegEx.java",
"src/ri/src/main/java/javax/annotation/Signed.java",
"src/ri/src/main/java/javax/annotation/Syntax.java",
"src/ri/src/main/java/javax/annotation/meta/TypeQualifierValidator.java",
"src/ri/src/main/java/javax/annotation/Tainted.java",
"src/ri/src/main/java/javax/annotation/Untainted.java",
"src/ri/src/main/java/javax/annotation/WillClose.java",
"src/ri/src/main/java/javax/annotation/WillCloseWhenClosed.java",
"src/ri/src/main/java/javax/annotation/WillNotClose.java",
"src/ri/src/main/java/javax/annotation/concurrent/GuardedBy.java",
"src/ri/src/main/java/javax/annotation/concurrent/Immutable.java",
"src/ri/src/main/java/javax/annotation/concurrent/NotThreadSafe.java",
"src/ri/src/main/java/javax/annotation/concurrent/ThreadSafe.java",
"src/ri/src/main/java/javax/annotation/meta/Exclusive.java",
"src/ri/src/main/java/javax/annotation/meta/Exhaustive.java",
"src/ri/src/main/java/javax/annotation/meta/TypeQualifier.java",
"src/ri/src/main/java/javax/annotation/meta/TypeQualifierNickname.java",
"src/ri/src/main/java/javax/annotation/meta/TypeQualifierDefault.java",
"src/ri/src/main/java/javax/annotation/meta/TypeQualifierNickname.java",
"src/ri/src/main/java/javax/annotation/meta/TypeQualifierValidator.java",
"src/ri/src/main/java/javax/annotation/meta/When.java",
"src/ri/src/main/java/javax/annotation/CheckForNull.java",
"src/ri/src/main/java/javax/annotation/MatchesPattern.java",
"src/ri/src/main/java/javax/annotation/concurrent/Immutable.java",
"src/ri/src/main/java/javax/annotation/concurrent/NotThreadSafe.java",
"src/ri/src/main/java/javax/annotation/concurrent/ThreadSafe.java",
"src/ri/src/main/java/javax/annotation/concurrent/GuardedBy.java",
"src/ri/src/main/java/javax/annotation/ParametersAreNonnullByDefault.java",
"src/ri/src/main/java/javax/annotation/WillClose.java",
"src/ri/src/main/java/javax/annotation/WillNotClose.java",
]
}
third_party/junit/BUILD.gn
View file @ 73f1202a
......@@ -13,7 +13,7 @@ android_library("junit") {
"//third_party/android_sdk:android_test_runner_java",
"//third_party/hamcrest:hamcrest_java",
]
java_files = [
sources = [
"src/src/main/java/junit/extensions/ActiveTestSuite.java",
"src/src/main/java/junit/extensions/RepeatedTest.java",
"src/src/main/java/junit/extensions/TestDecorator.java",
......@@ -89,8 +89,8 @@ android_library("junit") {
"src/src/main/java/org/junit/internal/builders/JUnit3Builder.java",
"src/src/main/java/org/junit/internal/builders/JUnit4Builder.java",
"src/src/main/java/org/junit/internal/builders/NullBuilder.java",
"src/src/main/java/org/junit/internal/matchers/StacktracePrintingMatcher.java",
"src/src/main/java/org/junit/internal/builders/SuiteMethodBuilder.java",
"src/src/main/java/org/junit/internal/matchers/StacktracePrintingMatcher.java",
"src/src/main/java/org/junit/internal/matchers/ThrowableCauseMatcher.java",
"src/src/main/java/org/junit/internal/matchers/ThrowableMessageMatcher.java",
"src/src/main/java/org/junit/internal/matchers/TypeSafeMatcher.java",
......
third_party/mockito/BUILD.gn
View file @ 73f1202a
This diff is collapsed.
third_party/netty-tcnative/BUILD.gn
View file @ 73f1202a
......@@ -33,15 +33,15 @@ shared_library("netty-tcnative-so") {
# Builds the Java part of netty-tcnative library.
android_library("netty-tcnative_java") {
java_files = [
sources = [
"src/java/io/netty/internal/tcnative/Buffer.java",
"src/java/io/netty/internal/tcnative/CertificateRequestedCallback.java",
"src/java/io/netty/internal/tcnative/CertificateVerifier.java",
"src/java/io/netty/internal/tcnative/Library.java",
"src/java/io/netty/internal/tcnative/NativeStaticallyReferencedJniMethods.java",
"src/java/io/netty/internal/tcnative/SessionTicketKey.java",
"src/java/io/netty/internal/tcnative/SSL.java",
"src/java/io/netty/internal/tcnative/SSLContext.java",
"src/java/io/netty/internal/tcnative/SessionTicketKey.java",
]
deps = [
"//base:base_java",
......
third_party/robolectric/BUILD.gn
View file @ 73f1202a
......@@ -81,7 +81,7 @@ java_library("robolectric_java") {
":android-all-8.1.0-robolectric-4611349_java",
":android-all-9-robolectric-4913185-2_java",
]
java_files = [
sources = [
"local/robolectric/src/main/java/org/robolectric/internal/dependency/MavenDependencyResolver.java",
"robolectric/robolectric/src/main/java/org/robolectric/ApkLoader.java",
"robolectric/robolectric/src/main/java/org/robolectric/ConfigMerger.java",
......@@ -139,7 +139,7 @@ java_library("robolectric_annotations_java") {
":android-all-9-robolectric-4913185-2_java",
":robolectric_shadowapi_java",
]
java_files = [
sources = [
"robolectric/annotations/src/main/java/org/robolectric/annotation/AccessibilityChecks.java",
"robolectric/annotations/src/main/java/org/robolectric/annotation/Config.java",
"robolectric/annotations/src/main/java/org/robolectric/annotation/DefaultApplication.java",
......@@ -167,7 +167,7 @@ java_annotation_processor("robolectric_processor") {
]
provider_configurations = [ "local/processor/src/main/resources/META-INF/services/javax.annotation.processing.Processor" ]
main_class = "org.robolectric.annotation.processing.RobolectricProcessor"
java_files = [
sources = [
"robolectric/processor/src/main/java/org/robolectric/annotation/processing/DocumentedElement.java",
"robolectric/processor/src/main/java/org/robolectric/annotation/processing/DocumentedMethod.java",
"robolectric/processor/src/main/java/org/robolectric/annotation/processing/DocumentedPackage.java",
......@@ -226,7 +226,7 @@ java_library("robolectric_resources_java") {
":robolectric_utils_java",
"//third_party/android_deps:com_google_guava_guava_java",
]
java_files = [
sources = [
"robolectric/resources/src/main/java/org/robolectric/RoboSettings.java",
"robolectric/resources/src/main/java/org/robolectric/UsesSdk.java",
"robolectric/resources/src/main/java/org/robolectric/manifest/ActivityData.java",
......@@ -339,7 +339,7 @@ java_library("robolectric_utils_java") {
deps = [
":robolectric_annotations_java",
]
java_files = [
sources = [
"robolectric/utils/src/main/java/org/robolectric/AndroidMetadata.java",
"robolectric/utils/src/main/java/org/robolectric/util/Clock.java",
"robolectric/utils/src/main/java/org/robolectric/util/Consumer.java",
......@@ -373,7 +373,7 @@ java_library("robolectric_sandbox_java") {
"//third_party/ow2_asm:asm_tree_java",
]
java_files = [
sources = [
"robolectric/sandbox/src/main/java/org/robolectric/JarInstrumentor.java",
"robolectric/sandbox/src/main/java/org/robolectric/internal/bytecode/ClassHandler.java",
"robolectric/sandbox/src/main/java/org/robolectric/internal/bytecode/ClassInstrumentor.java",
......@@ -425,7 +425,9 @@ java_library("robolectric_junit_java") {
"//third_party/junit:junit",
]
java_files = [ "robolectric/junit/src/main/java/org/robolectric/internal/SandboxTestRunner.java" ]
sources = [
"robolectric/junit/src/main/java/org/robolectric/internal/SandboxTestRunner.java",
]
}
java_library("robolectric_shadowapi_java") {
......@@ -434,7 +436,7 @@ java_library("robolectric_shadowapi_java") {
"//third_party/jsr-305:jsr_305_javalib",
]
java_files = [
sources = [
"robolectric/shadowapi/src/main/java/org/robolectric/annotation/internal/DoNotInstrument.java",
"robolectric/shadowapi/src/main/java/org/robolectric/annotation/internal/Instrument.java",
"robolectric/shadowapi/src/main/java/org/robolectric/internal/IShadow.java",
......@@ -489,7 +491,7 @@ java_library("shadows_core_java") {
],
]
}
java_files = [
sources = [
"robolectric/shadows/framework/src/main/java/android/webkit/RoboCookieManager.java",
"robolectric/shadows/framework/src/main/java/org/robolectric/RuntimeEnvironment.java",
"robolectric/shadows/framework/src/main/java/org/robolectric/android/AccessibilityUtil.java",
......@@ -882,7 +884,7 @@ java_library("shadows_multidex_java") {
testonly = true
processor_args_javac = [ "org.robolectric.annotation.processing.shadowPackage=org.robolectric.shadows.multidex" ]
provider_configurations = [ "local/shadows/multidex/src/main/resources/META-INF/services/org.robolectric.internal.ShadowProvider" ]
java_files = [
sources = [
"robolectric/shadows/multidex/src/main/java/org/robolectric/shadows/multidex/ShadowAndroidXMultiDex.java",
"robolectric/shadows/multidex/src/main/java/org/robolectric/shadows/multidex/ShadowMultiDex.java",
"robolectric/shadows/multidex/src/main/java/org/robolectric/shadows/multidex/package-info.java",
......@@ -913,7 +915,7 @@ java_library("shadows_play_services_java") {
testonly = true
processor_args_javac = [ "org.robolectric.annotation.processing.shadowPackage=org.robolectric.shadows.gms" ]
provider_configurations = [ "local/shadows/playservices/src/main/resources/META-INF/services/org.robolectric.internal.ShadowProvider" ]
java_files = [
sources = [
"robolectric/shadows/playservices/src/main/java/org/robolectric/shadows/gms/ShadowGoogleAuthUtil.java",
"robolectric/shadows/playservices/src/main/java/org/robolectric/shadows/gms/ShadowGooglePlayServicesUtil.java",
"robolectric/shadows/playservices/src/main/java/org/robolectric/shadows/gms/common/ShadowGoogleApiAvailability.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