GN: Allow java_* to set their .jar name

build/config/android/internal_rules.gni

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # Do not add any imports to non-//build directories here.
 # Some projects (e.g. V8) do not have non-build directories DEPS'ed in.
 import("//build_overrides/build.gni")
 import("//build/config/android/config.gni")
 import("//build/config/sanitizers/sanitizers.gni")
 
@@ skipping 16 matching lines @@
   "*android*:resources",
   "*:*_resources",
   "*:*_grd",
   "*:*locale_paks",
 
   # TODO(agrieve): Rename targets below to match above patterns.
   "*android_webview/glue:glue",
   "//build/android/pylib/device/commands:chromium_commands",
   "//build/android/rezip:rezip",
   "//chrome/test/android/cast_emulator:cast_emulator",
-  "//components/cronet/android:cronet_api",
-  "//components/cronet/android:cronet_javadoc_classpath",
   "//mojo/public/java:bindings",
   "//third_party/android_tools:emma_device",
   "//third_party/cardboard-java:cardboard-java",
   "//third_party/custom_tabs_client:custom_tabs_client_shared_lib",
   "//third_party/custom_tabs_client:custom_tabs_support_lib",
   "//third_party/errorprone:chromium_errorprone",
   "//third_party/haha:haha",
   "//third_party/junit:hamcrest",
   "//third_party/netty4:netty_all",
   "//third_party/netty-tcnative:netty-tcnative",
@@ skipping 1682 matching lines @@
     }
   }
 
   template("java_prebuilt_impl") {
     set_sources_assignment_filter([])
     forward_variables_from(invoker, [ "testonly" ])
     _supports_android =
         defined(invoker.supports_android) && invoker.supports_android
 
     assert(defined(invoker.jar_path))
+    if (defined(invoker.output_name)) {
+      _output_name = invoker.output_name
+    } else {
+      _output_name = get_path_info(invoker.jar_path, "name")
+    }
     _base_path = "${target_gen_dir}/$target_name"
 
     # Jar files can be needed at runtime (by Robolectric tests or java binaries),
     # so do not put them under gen/.
     _target_dir_name = get_label_info(":$target_name", "dir")
-    _jar_path = "$root_out_dir/lib.java$_target_dir_name/$target_name.jar"
+    _jar_path = "$root_out_dir/lib.java$_target_dir_name/$_output_name.jar"
     _ijar_path =
-        "$root_out_dir/lib.java$_target_dir_name/$target_name.interface.jar"
+        "$root_out_dir/lib.java$_target_dir_name/$_output_name.interface.jar"
     _build_config = _base_path + ".build_config"
 
     if (_supports_android) {
       _dex_path = _base_path + ".dex.jar"
     }
     _deps = []
     if (defined(invoker.deps)) {
       _deps = invoker.deps
     }
     _jar_deps = []
@@ skipping 407 matching lines @@
     forward_variables_from(invoker, [ "testonly" ])
     _accumulated_deps = []
     if (defined(invoker.deps)) {
       _accumulated_deps = invoker.deps
     }
 
     assert(defined(invoker.java_files) || defined(invoker.srcjars) ||
            defined(invoker.srcjar_deps))
     _base_path = "$target_gen_dir/$target_name"
 
+    if (defined(invoker.output_name)) {
+      _output_name = invoker.output_name
+    } else {
+      _output_name = target_name
+    }
+
     # Jar files can be needed at runtime (by Robolectric tests or java binaries),
     # so do not put them under gen/.
-    _jar_name = target_name
-    if (defined(invoker.jar_name)) {
-      _jar_name = invoker.jar_name
-    }
     target_dir_name = get_label_info(":$target_name", "dir")
-    _jar_path = "$root_out_dir/lib.java$target_dir_name/$_jar_name.jar"
+    _jar_path = "$root_out_dir/lib.java$target_dir_name/$_output_name.jar"
     if (defined(invoker.jar_path)) {
       _jar_path = invoker.jar_path
     }
     _template_name = target_name
 
     _final_deps = []
 
     _supports_android =
         defined(invoker.supports_android) && invoker.supports_android
     _requires_android =
@@ skipping 505 matching lines @@
         rebase_path(root_build_dir, root_build_dir),
         "--packed-libraries-dir",
         rebase_path(_packed_libraries_dir, root_build_dir),
         "--libraries=${invoker.libraries_filearg}",
         "--filelistjson",
         rebase_path(invoker.file_list_json, root_build_dir),
       ]
     }
   }
 }