Android: Remove srcjar_path argument for compile_resources

The whole point of srcjar_deps is that the path to the .srcjar doesn't
need to be known by the caller :P.

No behavior change.

Change-Id: If5f0e7649605d979081152478ca6c76c42e9ed8c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1856821
Auto-Submit: Andrew Grieve <agrieve@chromium.org>
Commit-Queue: Tibor Goldschwendt <tiborg@chromium.org>
Reviewed-by: Tibor Goldschwendt <tiborg@chromium.org>
Cr-Commit-Position: refs/heads/master@{#706614}

build/config/android/internal_rules.gni

@@ -2102,10 +2102,6 @@ if (enable_java_templates) {
   #       Path for the generated map between original resource paths and
   #       shortend resource paths.
   #
-  #   srcjar_path: (optional)
-  #       Path to a generated .srcjar containing the generated R.java sources
-  #       for all dependent resource libraries.
-  #
   #   proguard_file: (optional)
   #       Path to proguard configuration file for this apk target.
   #
@@ -2119,10 +2115,12 @@ if (enable_java_templates) {
     if (defined(invoker.optimized_arsc_output)) {
       _optimized_arsc_output = invoker.optimized_arsc_output
     }
-    _srcjar_path = invoker.srcjar_path
+    _final_srcjar_path = "${target_gen_dir}/${target_name}.srcjar"
+    _intermediate_srcjar_path = _final_srcjar_path
     if (defined(invoker.post_process_script)) {
       _compile_resources_target_name = "${target_name}__intermediate"
-      _srcjar_path = "${_srcjar_path}.intermediate.srcjar"
+      _intermediate_srcjar_path =
+          "${target_gen_dir}/${target_name}.intermediate.srcjar"
       _intermediate_path =
           get_path_info(_arsc_output, "dir") + "/" +
           get_path_info(_arsc_output, "name") + ".intermediate.ap_"
@@ -2177,13 +2175,13 @@ if (enable_java_templates) {
 
       inputs += [ invoker.android_manifest ]
       outputs = [
-        _srcjar_path,
+        _intermediate_srcjar_path,
       ]
       args += [
         "--android-manifest",
         rebase_path(invoker.android_manifest, root_build_dir),
         "--srcjar-out",
-        rebase_path(_srcjar_path, root_build_dir),
+        rebase_path(_intermediate_srcjar_path, root_build_dir),
       ]
       if (defined(invoker.no_xml_namespaces) && invoker.no_xml_namespaces) {
         args += [ "--no-xml-namespaces" ]
@@ -2429,9 +2427,9 @@ if (enable_java_templates) {
           "--depfile",
           rebase_path(depfile, root_build_dir),
           "--srcjar-in",
-          rebase_path(_srcjar_path, root_build_dir),
+          rebase_path(_intermediate_srcjar_path, root_build_dir),
           "--srcjar-out",
-          rebase_path(invoker.srcjar_path, root_build_dir),
+          rebase_path(_final_srcjar_path, root_build_dir),
         ]
         if (defined(_optimized_arsc_output)) {
           _input_apk = _optimized_arsc_output
@@ -2456,14 +2454,14 @@ if (enable_java_templates) {
         }
         inputs = [
           _input_apk,
-          _srcjar_path,
+          _intermediate_srcjar_path,
         ]
         if (defined(invoker.post_process_script_inputs)) {
           inputs += invoker.post_process_script_inputs
         }
         outputs = [
           _output_apk,
-          invoker.srcjar_path,
+          _final_srcjar_path,
         ]
         public_deps = [
           ":${_compile_resources_target_name}",

build/config/android/rules.gni

@@ -1404,7 +1404,6 @@ if (enable_java_templates) {
     compile_resources(_compile_resources_target) {
       deps = _deps + [ ":$_build_config_target_name" ]
       build_config = _build_config
-      srcjar_path = "${target_gen_dir}/${target_name}.srcjar"
       if (defined(_package_name)) {
         rename_manifest_package = _package_name
       }
@@ -2503,7 +2502,6 @@ if (enable_java_templates) {
       if (defined(invoker.post_process_package_resources_script)) {
         post_process_script = invoker.post_process_package_resources_script
       }
-      srcjar_path = "${target_gen_dir}/${target_name}.srcjar"
       r_text_out_path = _compile_resources_rtxt_out
       emit_ids_out_path = _compile_resources_emit_ids_out
       size_info_path = _res_size_info_path