Specify jar name for apks in java_apk.gypi

content/content_shell.gypi

Index: content/content_shell.gypi
diff --git a/content/content_shell.gypi b/content/content_shell.gypi
index e5841f2d617af4e1fe97ba2f8bdbdb7fd9654348..d2f154951d36d0d47ec10c742a59e0ab1d2ac689 100644
--- a/content/content_shell.gypi
+++ b/content/content_shell.gypi
@@ -592,27 +592,19 @@
         {
           # content_shell_apk creates a .jar as a side effect. Any java targets
           # that need that .jar in their classpath should depend on this target,
-          # content_shell_java.
+          # content_shell_java. Dependents of content_shell_apk receive its jar
+          # path in the variable 'apk_output_jar_path'.
           'target_name': 'content_shell_java',
           'type': 'none',
-          'variables': {
-            'output_jar': '<(PRODUCT_DIR)/lib.java/chromium_apk_content_shell.jar'
-          },
-          'outputs': ['<(output_jar)'],
           'dependencies': [
-            'content_java',
             'content_shell_apk',
-            '../base/base.gyp:base_java',
-            '../media/media.gyp:media_java',
-            '../net/net.gyp:net_java',
-            '../ui/ui.gyp:ui_java',
           ],
           # This all_dependent_settings is used for java targets only. This will
           # add the content_shell 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
@@ -621,7 +613,7 @@
             {
               'action_name': 'fake_generate_jar',
               'inputs': [],
-              'outputs': ['<(output_jar)'],
+              'outputs': ['>(apk_output_jar_path)'],
               'action': [],
             },
           ],