Replace java_files with sources in //build/android

Replace usages of java_files with sources in above directory's gn files, and automatically format. [email protected] Bug: 1035074 Change-Id: Icd179380bcba508e87cad272b6d5aee1f72f56b5 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1980874 Reviewed-by: Natalie Chouinard <[email protected]> Reviewed-by: Andrew Grieve <[email protected]> Commit-Queue: Natalie Chouinard <[email protected]> Cr-Commit-Position: refs/heads/master@{#727223}
scheib · Dec 23, 2019 · 3501fb8 · 3501fb8
1 parent bc6a036
commit 3501fb8
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 9 deletions.
diff --git a/build/android/buildhooks/BUILD.gn b/build/android/buildhooks/BUILD.gn
@@ -7,7 +7,9 @@ import("//build/config/android/rules.gni")
 
 java_library("build_hooks_java") {
   jacoco_never_instrument = true
-  java_files = [ "java/org/chromium/build/BuildHooks.java" ]
+  sources = [
+    "java/org/chromium/build/BuildHooks.java",
+  ]
 
   # Make all targets pull in the try-with-resources support files.
   # If an apk ends up not using any such statements, ProGuard will remove
@@ -36,7 +38,7 @@ build_hooks_android_impl = "java/org/chromium/build/BuildHooksAndroidImpl.java"
 
 android_library("build_hooks_android_java") {
   jacoco_never_instrument = true
-  java_files = [
+  sources = [
     "java/org/chromium/build/BuildHooksAndroid.java",
     build_hooks_android_impl,
   ]
@@ -50,7 +52,9 @@ android_library("build_hooks_android_java") {
 # specify a different implementation via build_hooks_android_impl_deps.
 android_library("build_hooks_android_impl_java") {
   jacoco_never_instrument = true
-  java_files = [ build_hooks_android_impl ]
+  sources = [
+    build_hooks_android_impl,
+  ]
   deps = [
     ":build_hooks_android_java",
   ]

diff --git a/build/android/bytecode/BUILD.gn b/build/android/bytecode/BUILD.gn
@@ -7,7 +7,7 @@ import("//build/config/android/rules.gni")
 assert(current_toolchain == default_toolchain)
 
 java_binary("java_bytecode_rewriter") {
-  java_files = [
+  sources = [
     "java/org/chromium/bytecode/AssertionEnablerClassAdapter.java",
     "java/org/chromium/bytecode/ByteCodeProcessor.java",
     "java/org/chromium/bytecode/ClassPathValidator.java",

diff --git a/build/android/gyp/test/BUILD.gn b/build/android/gyp/test/BUILD.gn
@@ -1,13 +1,17 @@
 import("//build/config/android/rules.gni")
 
 java_library("hello_world_java") {
-  java_files = [ "java/org/chromium/helloworld/HelloWorldPrinter.java" ]
+  sources = [
+    "java/org/chromium/helloworld/HelloWorldPrinter.java",
+  ]
 }
 
 java_binary("hello_world") {
   deps = [
     ":hello_world_java",
   ]
-  java_files = [ "java/org/chromium/helloworld/HelloWorldMain.java" ]
+  sources = [
+    "java/org/chromium/helloworld/HelloWorldMain.java",
+  ]
   main_class = "org.chromium.helloworld.HelloWorldMain"
 }
diff --git a/build/android/incremental_install/BUILD.gn b/build/android/incremental_install/BUILD.gn
@@ -7,7 +7,7 @@ import("//build/config/android/rules.gni")
 android_library("bootstrap_java") {
   # Use .dex rather than .dex.jar to be usable by package_apk().
   dex_path = "$target_out_dir/bootstrap.dex"
-  java_files = [
+  sources = [
     "java/org/chromium/incrementalinstall/BootstrapApplication.java",
     "java/org/chromium/incrementalinstall/BootstrapInstrumentation.java",
     "java/org/chromium/incrementalinstall/ClassLoaderPatcher.java",

diff --git a/build/android/pylib/device/commands/BUILD.gn b/build/android/pylib/device/commands/BUILD.gn
@@ -12,7 +12,9 @@ group("commands") {
 
 android_library("chromium_commands_java") {
   jacoco_never_instrument = true
-  java_files = [ "java/src/org/chromium/android/commands/unzip/Unzip.java" ]
+  sources = [
+    "java/src/org/chromium/android/commands/unzip/Unzip.java",
+  ]
   dex_path = "$root_build_dir/lib.java/chromium_commands.dex.jar"
   deps = [
     "//base:base_java",

diff --git a/build/android/stacktrace/BUILD.gn b/build/android/stacktrace/BUILD.gn
@@ -6,7 +6,9 @@ import("//build/config/android/rules.gni")
 
 java_binary("java_deobfuscate") {
   main_class = "org.chromium.build.FlushingReTrace"
-  java_files = [ "java/org/chromium/build/FlushingReTrace.java" ]
+  sources = [
+    "java/org/chromium/build/FlushingReTrace.java",
+  ]
   deps = [
     "//third_party/proguard:retrace_java",
   ]