Commit 3501fb8f authored by Natalie Chouinard's avatar Natalie Chouinard Committed by Commit Bot

Replace java_files with sources in //build/android

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

TBR=tiborg@chromium.org

Bug: 1035074
Change-Id: Icd179380bcba508e87cad272b6d5aee1f72f56b5
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1980874Reviewed-by: default avatarNatalie Chouinard <chouinard@chromium.org>
Reviewed-by: default avatarAndrew Grieve <agrieve@chromium.org>
Commit-Queue: Natalie Chouinard <chouinard@chromium.org>
Cr-Commit-Position: refs/heads/master@{#727223}
parent bc6a036f
...@@ -7,7 +7,9 @@ import("//build/config/android/rules.gni") ...@@ -7,7 +7,9 @@ import("//build/config/android/rules.gni")
java_library("build_hooks_java") { java_library("build_hooks_java") {
jacoco_never_instrument = true 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. # Make all targets pull in the try-with-resources support files.
# If an apk ends up not using any such statements, ProGuard will remove # 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" ...@@ -36,7 +38,7 @@ build_hooks_android_impl = "java/org/chromium/build/BuildHooksAndroidImpl.java"
android_library("build_hooks_android_java") { android_library("build_hooks_android_java") {
jacoco_never_instrument = true jacoco_never_instrument = true
java_files = [ sources = [
"java/org/chromium/build/BuildHooksAndroid.java", "java/org/chromium/build/BuildHooksAndroid.java",
build_hooks_android_impl, build_hooks_android_impl,
] ]
...@@ -50,7 +52,9 @@ android_library("build_hooks_android_java") { ...@@ -50,7 +52,9 @@ android_library("build_hooks_android_java") {
# specify a different implementation via build_hooks_android_impl_deps. # specify a different implementation via build_hooks_android_impl_deps.
android_library("build_hooks_android_impl_java") { android_library("build_hooks_android_impl_java") {
jacoco_never_instrument = true jacoco_never_instrument = true
java_files = [ build_hooks_android_impl ] sources = [
build_hooks_android_impl,
]
deps = [ deps = [
":build_hooks_android_java", ":build_hooks_android_java",
] ]
......
...@@ -7,7 +7,7 @@ import("//build/config/android/rules.gni") ...@@ -7,7 +7,7 @@ import("//build/config/android/rules.gni")
assert(current_toolchain == default_toolchain) assert(current_toolchain == default_toolchain)
java_binary("java_bytecode_rewriter") { java_binary("java_bytecode_rewriter") {
java_files = [ sources = [
"java/org/chromium/bytecode/AssertionEnablerClassAdapter.java", "java/org/chromium/bytecode/AssertionEnablerClassAdapter.java",
"java/org/chromium/bytecode/ByteCodeProcessor.java", "java/org/chromium/bytecode/ByteCodeProcessor.java",
"java/org/chromium/bytecode/ClassPathValidator.java", "java/org/chromium/bytecode/ClassPathValidator.java",
......
import("//build/config/android/rules.gni") import("//build/config/android/rules.gni")
java_library("hello_world_java") { java_library("hello_world_java") {
java_files = [ "java/org/chromium/helloworld/HelloWorldPrinter.java" ] sources = [
"java/org/chromium/helloworld/HelloWorldPrinter.java",
]
} }
java_binary("hello_world") { java_binary("hello_world") {
deps = [ deps = [
":hello_world_java", ":hello_world_java",
] ]
java_files = [ "java/org/chromium/helloworld/HelloWorldMain.java" ] sources = [
"java/org/chromium/helloworld/HelloWorldMain.java",
]
main_class = "org.chromium.helloworld.HelloWorldMain" main_class = "org.chromium.helloworld.HelloWorldMain"
} }
...@@ -7,7 +7,7 @@ import("//build/config/android/rules.gni") ...@@ -7,7 +7,7 @@ import("//build/config/android/rules.gni")
android_library("bootstrap_java") { android_library("bootstrap_java") {
# Use .dex rather than .dex.jar to be usable by package_apk(). # Use .dex rather than .dex.jar to be usable by package_apk().
dex_path = "$target_out_dir/bootstrap.dex" dex_path = "$target_out_dir/bootstrap.dex"
java_files = [ sources = [
"java/org/chromium/incrementalinstall/BootstrapApplication.java", "java/org/chromium/incrementalinstall/BootstrapApplication.java",
"java/org/chromium/incrementalinstall/BootstrapInstrumentation.java", "java/org/chromium/incrementalinstall/BootstrapInstrumentation.java",
"java/org/chromium/incrementalinstall/ClassLoaderPatcher.java", "java/org/chromium/incrementalinstall/ClassLoaderPatcher.java",
......
...@@ -12,7 +12,9 @@ group("commands") { ...@@ -12,7 +12,9 @@ group("commands") {
android_library("chromium_commands_java") { android_library("chromium_commands_java") {
jacoco_never_instrument = true 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" dex_path = "$root_build_dir/lib.java/chromium_commands.dex.jar"
deps = [ deps = [
"//base:base_java", "//base:base_java",
......
...@@ -6,7 +6,9 @@ import("//build/config/android/rules.gni") ...@@ -6,7 +6,9 @@ import("//build/config/android/rules.gni")
java_binary("java_deobfuscate") { java_binary("java_deobfuscate") {
main_class = "org.chromium.build.FlushingReTrace" main_class = "org.chromium.build.FlushingReTrace"
java_files = [ "java/org/chromium/build/FlushingReTrace.java" ] sources = [
"java/org/chromium/build/FlushingReTrace.java",
]
deps = [ deps = [
"//third_party/proguard:retrace_java", "//third_party/proguard:retrace_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