Commit 505a3ffb authored by Natalie Chouinard's avatar Natalie Chouinard Committed by Commit Bot

Replace java_files with sources in //services

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

Bug: 1035074
Change-Id: Iac1b3ad1d3acd47e895cc6b0283a89bbd2f63c6f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1977379Reviewed-by: default avatarKen Rockot <rockot@google.com>
Commit-Queue: Natalie Chouinard <chouinard@chromium.org>
Cr-Commit-Position: refs/heads/master@{#726652}
parent 9e87d6a1
...@@ -96,10 +96,10 @@ if (!is_ios) { ...@@ -96,10 +96,10 @@ if (!is_ios) {
if (is_android) { if (is_android) {
junit_binary("service_junit_tests") { junit_binary("service_junit_tests") {
java_files = [ sources = [
"device/generic_sensor/android/junit/src/org/chromium/device/sensors/PlatformSensorAndProviderTest.java", "device/generic_sensor/android/junit/src/org/chromium/device/sensors/PlatformSensorAndProviderTest.java",
"device/nfc/android/junit/src/org/chromium/device/nfc/NFCTest.java",
"device/geolocation/android/junit/src/org/chromium/device/geolocation/LocationProviderTest.java", "device/geolocation/android/junit/src/org/chromium/device/geolocation/LocationProviderTest.java",
"device/nfc/android/junit/src/org/chromium/device/nfc/NFCTest.java",
"shape_detection/android/junit/src/org/chromium/shape_detection/BitmapUtilsTest.java", "shape_detection/android/junit/src/org/chromium/shape_detection/BitmapUtilsTest.java",
] ]
deps = [ deps = [
...@@ -127,7 +127,7 @@ if (is_android) { ...@@ -127,7 +127,7 @@ if (is_android) {
android_library("service_javatests") { android_library("service_javatests") {
testonly = true testonly = true
java_files = [ sources = [
"shape_detection/android/javatests/src/org/chromium/shape_detection/BarcodeDetectionImplTest.java", "shape_detection/android/javatests/src/org/chromium/shape_detection/BarcodeDetectionImplTest.java",
"shape_detection/android/javatests/src/org/chromium/shape_detection/FaceDetectionImplTest.java", "shape_detection/android/javatests/src/org/chromium/shape_detection/FaceDetectionImplTest.java",
"shape_detection/android/javatests/src/org/chromium/shape_detection/TestUtils.java", "shape_detection/android/javatests/src/org/chromium/shape_detection/TestUtils.java",
......
...@@ -18,6 +18,6 @@ if (current_toolchain == default_toolchain) { ...@@ -18,6 +18,6 @@ if (current_toolchain == default_toolchain) {
"//base:jni_java", "//base:jni_java",
] ]
annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ] annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
java_files = [] + _jni_sources sources = [] + _jni_sources
} }
} }
...@@ -365,7 +365,7 @@ if (is_android) { ...@@ -365,7 +365,7 @@ if (is_android) {
"//content/public/android:*", "//content/public/android:*",
"//services:*", "//services:*",
] ]
java_files = [ sources = [
"android/java/src/org/chromium/services/device/InterfaceRegistrar.java", "android/java/src/org/chromium/services/device/InterfaceRegistrar.java",
] ]
deps = [ deps = [
......
...@@ -7,10 +7,10 @@ import("//build/config/android/rules.gni") ...@@ -7,10 +7,10 @@ import("//build/config/android/rules.gni")
android_library("battery_monitor_java") { android_library("battery_monitor_java") {
visibility = [ "//services/device:*" ] visibility = [ "//services/device:*" ]
java_files = [ sources = [
"java/src/org/chromium/device/battery/BatteryStatusManager.java",
"java/src/org/chromium/device/battery/BatteryMonitorImpl.java",
"java/src/org/chromium/device/battery/BatteryMonitorFactory.java", "java/src/org/chromium/device/battery/BatteryMonitorFactory.java",
"java/src/org/chromium/device/battery/BatteryMonitorImpl.java",
"java/src/org/chromium/device/battery/BatteryStatusManager.java",
] ]
deps = [ deps = [
......
...@@ -137,7 +137,7 @@ if (is_android) { ...@@ -137,7 +137,7 @@ if (is_android) {
"//services/device:*", "//services/device:*",
] ]
java_files = device_sensors_jni_sources sources = device_sensors_jni_sources
deps = [ deps = [
"//base:base_java", "//base:base_java",
"//base:jni_java", "//base:jni_java",
......
...@@ -141,7 +141,7 @@ if (is_android) { ...@@ -141,7 +141,7 @@ if (is_android) {
} }
android_library("geolocation_java") { android_library("geolocation_java") {
java_files = [ sources = [
"android/java/src/org/chromium/device/geolocation/LocationProviderAdapter.java", "android/java/src/org/chromium/device/geolocation/LocationProviderAdapter.java",
"android/java/src/org/chromium/device/geolocation/LocationProviderAndroid.java", "android/java/src/org/chromium/device/geolocation/LocationProviderAndroid.java",
"android/java/src/org/chromium/device/geolocation/LocationProviderFactory.java", "android/java/src/org/chromium/device/geolocation/LocationProviderFactory.java",
......
...@@ -10,7 +10,7 @@ android_library("java") { ...@@ -10,7 +10,7 @@ android_library("java") {
"//services:*", "//services:*",
"//services/device:*", "//services/device:*",
] ]
java_files = [ sources = [
"java/src/org/chromium/device/nfc/InvalidNdefMessageException.java", "java/src/org/chromium/device/nfc/InvalidNdefMessageException.java",
"java/src/org/chromium/device/nfc/NdefMessageUtils.java", "java/src/org/chromium/device/nfc/NdefMessageUtils.java",
"java/src/org/chromium/device/nfc/NdefMessageValidator.java", "java/src/org/chromium/device/nfc/NdefMessageValidator.java",
......
...@@ -5,20 +5,24 @@ ...@@ -5,20 +5,24 @@
import("//build/config/android/rules.gni") import("//build/config/android/rules.gni")
android_library("nfc_java") { android_library("nfc_java") {
java_files = [ "src/org/chromium/device/nfc/NfcDelegate.java" ] sources = [
"src/org/chromium/device/nfc/NfcDelegate.java",
]
deps = [ deps = [
"//base:base_java", "//base:base_java",
] ]
} }
android_library("geolocation_java") { android_library("geolocation_java") {
java_files = [ "src/org/chromium/device/geolocation/LocationProvider.java" ] sources = [
"src/org/chromium/device/geolocation/LocationProvider.java",
]
} }
android_library("geolocation_java_test_support") { android_library("geolocation_java_test_support") {
testonly = true testonly = true
java_files = [ sources = [
"src/org/chromium/device/geolocation/LocationProviderOverrider.java", "src/org/chromium/device/geolocation/LocationProviderOverrider.java",
"src/org/chromium/device/geolocation/MockLocationProvider.java", "src/org/chromium/device/geolocation/MockLocationProvider.java",
] ]
......
...@@ -43,7 +43,9 @@ if (is_android) { ...@@ -43,7 +43,9 @@ if (is_android) {
# However, various generated targets also need to see this target as a # However, various generated targets also need to see this target as a
# result of //services/device:java depending on it. # result of //services/device:java depending on it.
visibility = [ "//services/device:*" ] visibility = [ "//services/device:*" ]
java_files = [ "android/java/src/org/chromium/device/screen_orientation/ScreenOrientationListener.java" ] sources = [
"android/java/src/org/chromium/device/screen_orientation/ScreenOrientationListener.java",
]
deps = [ deps = [
"//base:base_java", "//base:base_java",
"//ui/android:ui_java", "//ui/android:ui_java",
......
...@@ -67,7 +67,9 @@ if (is_android) { ...@@ -67,7 +67,9 @@ if (is_android) {
# However, various generated targets also need to see this target as a # However, various generated targets also need to see this target as a
# result of //services/device:java depending on it. # result of //services/device:java depending on it.
visibility = [ "//services/device:*" ] visibility = [ "//services/device:*" ]
java_files = [ "android/java/src/org/chromium/device/time_zone_monitor/TimeZoneMonitor.java" ] sources = [
"android/java/src/org/chromium/device/time_zone_monitor/TimeZoneMonitor.java",
]
deps = [ deps = [
"//base:base_java", "//base:base_java",
"//base:jni_java", "//base:jni_java",
......
...@@ -206,7 +206,7 @@ if (is_android) { ...@@ -206,7 +206,7 @@ if (is_android) {
} }
android_library("java") { android_library("java") {
java_files = java_sources_needing_jni sources = java_sources_needing_jni
deps = [ deps = [
"//base:base_java", "//base:base_java",
"//base:jni_java", "//base:jni_java",
......
...@@ -14,8 +14,9 @@ generate_jni("vibration_jni_headers") { ...@@ -14,8 +14,9 @@ generate_jni("vibration_jni_headers") {
android_library("vibration_manager_java") { android_library("vibration_manager_java") {
visibility = [ "//services/device:*" ] visibility = [ "//services/device:*" ]
java_files = sources = [
[ "java/src/org/chromium/device/vibration/VibrationManagerImpl.java" ] "java/src/org/chromium/device/vibration/VibrationManagerImpl.java",
]
deps = [ deps = [
"//base:base_java", "//base:base_java",
......
...@@ -89,7 +89,7 @@ if (is_android) { ...@@ -89,7 +89,7 @@ if (is_android) {
"//services:*", "//services:*",
"//services/device:*", "//services/device:*",
] ]
java_files = java_sources_needing_jni sources = java_sources_needing_jni
deps = [ deps = [
"//base:base_java", "//base:base_java",
] ]
......
...@@ -19,6 +19,6 @@ if (current_toolchain == default_toolchain) { ...@@ -19,6 +19,6 @@ if (current_toolchain == default_toolchain) {
deps = [ deps = [
"//base:base_java", "//base:base_java",
] ]
java_files = _jni_sources sources = _jni_sources
} }
} }
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
import("//build/config/android/rules.gni") import("//build/config/android/rules.gni")
android_library("service_manager_java") { android_library("service_manager_java") {
java_files = [ sources = [
"src/org/chromium/services/service_manager/Connector.java", "src/org/chromium/services/service_manager/Connector.java",
"src/org/chromium/services/service_manager/InterfaceFactory.java", "src/org/chromium/services/service_manager/InterfaceFactory.java",
"src/org/chromium/services/service_manager/InterfaceProvider.java", "src/org/chromium/services/service_manager/InterfaceProvider.java",
......
...@@ -83,14 +83,14 @@ if (is_android) { ...@@ -83,14 +83,14 @@ if (is_android) {
} }
android_library("shape_detection_java") { android_library("shape_detection_java") {
java_files = [ sources = [
"android/java/src/org/chromium/shape_detection/BarcodeDetectionImpl.java", "android/java/src/org/chromium/shape_detection/BarcodeDetectionImpl.java",
"android/java/src/org/chromium/shape_detection/BarcodeDetectionProviderImpl.java", "android/java/src/org/chromium/shape_detection/BarcodeDetectionProviderImpl.java",
"android/java/src/org/chromium/shape_detection/BitmapUtils.java",
"android/java/src/org/chromium/shape_detection/FaceDetectionImpl.java", "android/java/src/org/chromium/shape_detection/FaceDetectionImpl.java",
"android/java/src/org/chromium/shape_detection/FaceDetectionImplGmsCore.java", "android/java/src/org/chromium/shape_detection/FaceDetectionImplGmsCore.java",
"android/java/src/org/chromium/shape_detection/FaceDetectionProviderImpl.java", "android/java/src/org/chromium/shape_detection/FaceDetectionProviderImpl.java",
"android/java/src/org/chromium/shape_detection/InterfaceRegistrar.java", "android/java/src/org/chromium/shape_detection/InterfaceRegistrar.java",
"android/java/src/org/chromium/shape_detection/BitmapUtils.java",
"android/java/src/org/chromium/shape_detection/TextDetectionImpl.java", "android/java/src/org/chromium/shape_detection/TextDetectionImpl.java",
] ]
......
...@@ -138,7 +138,8 @@ if (is_android) { ...@@ -138,7 +138,8 @@ if (is_android) {
deps = [ deps = [
"//base:base_java", "//base:base_java",
] ]
java_files = sources = [
[ "android/test/src/org/chromium/tracing/UnwindTestHelper.java" ] "android/test/src/org/chromium/tracing/UnwindTestHelper.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