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 43f4da758739a2bbc8db5676fe1a652ee66f0fad..9ad8547716cef103c09a5b5543a4e0000fd2fbcc 100644
--- a/content/content_shell.gypi
+++ b/content/content_shell.gypi
@@ -585,27 +585,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. Direct dependents of content_shell_apk receive
+          # its jar path in the variable 'apk_output_jar_path'.

[Yaron, 2012/11/08 02:22:57]

Isn't this "All dependents"?

[cjhopman, 2012/11/14 23:32:53]

Done.

           '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
@@ -614,7 +606,7 @@
             {
               'action_name': 'fake_generate_jar',
               'inputs': [],
-              'outputs': ['<(output_jar)'],
+              'outputs': ['>(apk_output_jar_path)'],
               'action': [],
             },
           ],