Specify jar name for apks in java_apk.gypi

chrome/chrome_android.gypi

 # Copyright (c) 2012 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.
 {
   'variables': {
     'chromium_code': 1,
   },
   'includes': [
     'chrome_android_paks.gypi', # Included for the list of pak resources.
   ],
@@ skipping 58 matching lines @@
         'android/testshell/java/src/org/chromium/chrome/testshell/TabManager.java',
       ],
       'variables': {
         'jni_gen_dir': 'chromium_testshell',
       },
       'includes': [ '../build/jni_generator.gypi' ],
     },
     {
       # chromium_testshell creates a .jar as a side effect. Any java targets
       # that need that .jar in their classpath should depend on this target,
-      # chromium_testshell_java.
+      # chromium_testshell_java. Dependents of chromium_testshell receive its
+      # jar path in the variable 'apk_output_jar_path'.
       'target_name': 'chromium_testshell_java',
       'type': 'none',
       'dependencies': [
-        '../media/media.gyp:media_java',
-        'chrome.gyp:chrome_java',
         'chromium_testshell',
       ],
-      'variables': {
-        'output_jar': '<(PRODUCT_DIR)/lib.java/chromium_apk_chromium_testshell.jar'
-      },
-      'outputs': ['<(output_jar)'],
       # This all_dependent_settings is used for java targets only. This will add
       # the chromium_testshell jar to the classpath of dependent java targets.
       'all_dependent_settings': {
         'variables': {
-          'input_jars_paths': ['<(output_jar)'],
+          'input_jars_paths': ['>(apk_output_jar_path)'],
         },
       },
       # Add an action with the appropriate output. This allows the generated
       # buildfiles to determine which target the output corresponds to.
       'actions': [
         {
           'action_name': 'fake_generate_jar',
           'inputs': [],
-          'outputs': ['<(output_jar)'],
+          'outputs': ['>(apk_output_jar_path)'],
           'action': [],
         },
       ],
     },
     {
       'target_name': 'chrome_android_core',
       'type': 'static_library',
       'dependencies': [
         'chrome.gyp:browser',
         'chrome.gyp:plugin',
@@ skipping 31 matching lines @@
       ],
       'copies': [
         {
           'destination': '<(chrome_android_pak_output_folder)',
           'files': [ '<@(chrome_android_pak_input_resources)' ],
         }
       ],
     },
   ],
 }