GN: Allow java_* to set their .jar name

build/config/android/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/config/android/config.gni")
 import("//build/config/android/internal_rules.gni")
 import("//build/config/compiler/compiler.gni")
 import("//build/config/dcheck_always_on.gni")
@@ skipping 1042 matching lines @@
     _test_runner_target_name = "${target_name}__test_runner_script"
 
     test_runner_script(_test_runner_target_name) {
       test_name = invoker.target_name
       test_suite = invoker.target_name
       test_type = "junit"
     }
 
     java_binary(_java_binary_target_name) {
       deps = []
-      jar_name = invoker.target_name
+      output_name = invoker.target_name
       forward_variables_from(invoker, "*")
       testonly = true
       bypass_platform_checks = true
       main_class = "org.chromium.testing.local.JunitTestMain"
       wrapper_script_name = "helper/$target_name"
       deps += [
         "//testing/android/junit:junit_test_support",
         "//third_party/junit",
         "//third_party/mockito:mockito_java",
         "//third_party/robolectric:robolectric_all_java",
@@ skipping 24 matching lines @@
   #     appear in deps.
   #
   #   chromium_code: If true, extra analysis warning/errors will be enabled.
   #   enable_errorprone: If true, enables the errorprone compiler.
   #   enable_incremental_javac_override: Overrides the global
   #     enable_incremental_javac.
   #
   #   jar_excluded_patterns: List of patterns of .class files to exclude from the
   #     final jar.
   #
+  #   output_name: File name for the output .jar (not including extension).
+  #     Defaults to the input .jar file name.
+  #
   #   proguard_preprocess: If true, proguard preprocessing will be run. This can
   #     be used to remove unwanted parts of the library.
   #   proguard_preprocess_config: Path to the proguard config for preprocessing.
   #   proguard_configs: List of proguard configs to use in final apk step for
   #     any apk that depends on this library.
   #
   #   supports_android: If true, Android targets (android_library, android_apk)
   #     may depend on this target. Note: if true, this target must only use the
   #     subset of Java available on Android.
   #   bypass_platform_checks: Disables checks about cross-platform (Java/Android)
@@ skipping 31 matching lines @@
     }
   }
 
   # Declare a java library target for a prebuilt jar
   #
   # Variables
   #   deps: Specifies the dependencies of this target. Java targets in this list
   #     will be added to the javac classpath.
   #   jar_path: Path to the prebuilt jar.
   #   jar_dep: Target that builds jar_path (optional).
+  #   output_name: File name for the output .jar (not including extension).
+  #     Defaults to the input .jar file name.
   #   proguard_preprocess: If true, proguard preprocessing will be run. This can
   #     be used to remove unwanted parts of the library.
   #   proguard_preprocess_config: Path to the proguard config for preprocessing.
   #   proguard_configs: List of proguard configs to use in final apk step for
   #     any apk that depends on this library.
   #   supports_android: If true, Android targets (android_library, android_apk)
   #     may depend on this target. Note: if true, this target must only use the
   #     subset of Java available on Android.
   #
   # Example
@@ skipping 38 matching lines @@
   #
   #   jar_excluded_patterns: List of patterns of .class files to exclude from the
   #     final jar.
   #
   #   proguard_preprocess: If true, proguard preprocessing will be run. This can
   #     be used to remove unwanted parts of the library.
   #   proguard_preprocess_config: Path to the proguard config for preprocessing.
   #   proguard_configs: List of proguard configs to use in final apk step for
   #     any apk that depends on this library.
   #
+  #   output_name: File name for the output .jar (not including extension).
+  #     Defaults to the input .jar file name.
   #   dex_path: If set, the resulting .dex.jar file will be placed under this
   #     path.
   #
   #   alternative_android_sdk_ijar: if set, the given android_sdk_ijar file
   #     replaces the default android_sdk_ijar.
   #
   #   alternative_android_sdk_ijar_dep: the target that generates
   #      alternative_android_sdk_ijar, must be set if alternative_android_sdk_ijar
   #      is used.
   #
@@ skipping 65 matching lines @@
   # Declare an Android library target for a prebuilt jar
   #
   # This target creates an Android library containing java code and Android
   # resources.
   #
   # Variables
   #   deps: Specifies the dependencies of this target. Java targets in this list
   #     will be added to the javac classpath. Android resources in dependencies
   #     will be used when building this library.
   #   jar_path: Path to the prebuilt jar.
+  #   output_name: File name for the output .jar (not including extension).
+  #     Defaults to the input .jar file name.
   #   proguard_preprocess: If true, proguard preprocessing will be run. This can
   #     be used to remove unwanted parts of the library.
   #   proguard_preprocess_config: Path to the proguard config for preprocessing.
   #   proguard_configs: List of proguard configs to use in final apk step for
   #     any apk that depends on this library.
   #
   # Example
   #   android_java_prebuilt("foo_java") {
   #     jar_path = "foo.jar"
   #     deps = [
@@ skipping 1394 matching lines @@
                                  "requires_android",
                                ])
         deps = [
           ":$_unpack_target_name",
         ]
         if (!defined(requires_android)) {
           requires_android = true
         }
         supports_android = true
         jar_path = "$_output_path/${_tuple[1]}"
+        _base_output_name = get_path_info(jar_path, "name")
+        output_name = "${invoker.target_name}-$_base_output_name"
       }
     }
 
     # Create android_java_prebuilt target for classes.jar.
     if (_scanned_files.has_classes_jar) {
       _jar_target_name = "${target_name}__classes"
       java_prebuilt(_jar_target_name) {
         forward_variables_from(invoker,
                                [
                                  "deps",
                                  "input_jars_paths",
                                  "jar_excluded_patterns",
                                  "proguard_configs",
                                  "requires_android",
                                ])
         if (!defined(deps)) {
           deps = []
         }
         deps += _subjar_targets + [ ":$_unpack_target_name" ]
         if (defined(_res_target_name)) {
           deps += [ ":$_res_target_name" ]
         }
         if (!defined(requires_android)) {
           requires_android = true
         }
         supports_android = true
         jar_path = "$_output_path/classes.jar"
+        output_name = invoker.target_name
 
         if (_scanned_files.has_proguard_flags) {
           if (!defined(proguard_configs)) {
             proguard_configs = []
           }
           proguard_configs += [ "$_output_path/proguard.txt" ]
         }
       }
     }
 
     java_group(target_name) {
       deps = []
       if (defined(_jar_target_name)) {
         deps += [ ":$_jar_target_name" ]
 
         # Although subjars are meant to be private, we add them as deps here
         # because in practice they seem to contain classes required to be in the
         # classpath.
         deps += _subjar_targets
       }
       if (defined(_res_target_name)) {
         deps += [ ":$_res_target_name" ]
       }
     }
   }
 }