Android: Fix jar_path vs. unprocessed_jar_path mixups

As a result, fixes incorrect source path attribution of some classes in
SuperSize reports.

Bug: 1002064
Change-Id: Ic49d64d6b12644f6e59a227dc14a8a3f2ce389b7
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2242680Reviewed-by: Samuel Huang <huangs@chromium.org>
Commit-Queue: Andrew Grieve <agrieve@chromium.org>
Cr-Commit-Position: refs/heads/master@{#777926}

build/android/gyp/write_build_config.py

@@ -701,8 +701,8 @@ class Deps(object):
     def helper(cur):
       for config in cur.Direct('java_library'):
         if config['is_prebuilt'] or config['gradle_treat_as_prebuilt']:
-          if config['jar_path'] not in ret:
-            ret.append(config['jar_path'])
+          if config['unprocessed_jar_path'] not in ret:
+            ret.append(config['unprocessed_jar_path'])
 
     helper(self)
     return ret
@@ -1616,7 +1616,7 @@ def main(argv):
                                                  'junit_binary'):
     deps_info['jni']['all_source'] = sorted(set(all_java_sources))
 
-  system_jars = [c['jar_path'] for c in system_library_deps]
+  system_jars = [c['unprocessed_jar_path'] for c in system_library_deps]
   system_interface_jars = [c['interface_jar_path'] for c in system_library_deps]
   if system_library_deps:
     config['android'] = {}

build/config/android/internal_rules.gni

@@ -2678,7 +2678,7 @@ if (enable_java_templates) {
         _rebased_build_config =
             rebase_path(invoker.build_config, root_build_dir)
         args += [
-          "--jar-files=@FileArg($_rebased_build_config:deps_info:jar_path)",
+          "--jar-files=@FileArg($_rebased_build_config:deps_info:unprocessed_jar_path)",
           "--jar-files=@FileArg($_rebased_build_config:deps_info:javac_full_classpath)",
           "--in-res-info-path",
           rebase_path(invoker.res_size_info_path, root_build_dir),