Make java.gypi export jar path to input_jars_paths variable

Both java.gypi and apk_test.gypi expect the jar path in
input_jars_paths. This means that we were specifying the dependence in
both 'dependencies' and 'input_jars_paths'. This change makes it so that
we don't need that redundancy.

Also, make java.gypi use input_jars_paths in its input so that we
actually rebuild targets when we should.

BUG=136756


Review URL: https://chromiumcodereview.appspot.com/10837143

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@150850 0039d316-1c4b-4281-b951-d872f2087c98

base/base.gyp

@@ -976,7 +976,6 @@
           'variables': {
             'test_suite_name': 'base_unittests',
             'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)base_unittests<(SHARED_LIB_SUFFIX)',
-            'input_jars_paths': ['<(PRODUCT_DIR)/lib.java/chromium_base.jar',],
           },
           'includes': [ '../build/apk_test.gypi' ],
         },

build/apk_test.gypi

@@ -19,6 +19,9 @@
 #
 
 {
+  'variables': {
+    'input_jars_paths': [],
+  },
   'target_conditions': [
     ['_toolset == "target"', {
       'conditions': [
@@ -30,7 +33,7 @@
               '<(DEPTH)/testing/android/AndroidManifest.xml',
               '<(DEPTH)/testing/android/generate_native_test.py',
               '<(input_shlib_path)',
-              '<@(input_jars_paths)',
+              '>@(input_jars_paths)',
             ],
             'outputs': [
               '<(PRODUCT_DIR)/<(test_suite_name)_apk/<(test_suite_name)-debug.apk',
@@ -40,7 +43,7 @@
               '--native_library',
               '<(input_shlib_path)',
               '--jars',
-              '"<@(input_jars_paths)"',
+              '">@(input_jars_paths)"',
               '--output',
               '<(PRODUCT_DIR)/<(test_suite_name)_apk',
               '--app_abi',

build/java.gypi

@@ -26,18 +26,26 @@
 #
 # Finally, the generated jar-file will be:
 #   <(PRODUCT_DIR)/lib.java/chromium_base.jar
-#
-# TODO(yfriedman): The "finally" statement isn't entirely true yet, as we don't
-# auto-generate the ant file yet.
 
 {
+  'direct_dependent_settings': {
+    'variables': {
+      'input_jars_paths': ['<(PRODUCT_DIR)/lib.java/chromium_<(package_name).jar'],
+    },
+  },
+  'variables': {
+    'input_jars_paths': [],
+  },
   'actions': [
     {
       'action_name': 'ant_<(package_name)',
       'message': 'Building <(package_name) java sources.',
       'inputs': [
-         '<(java_in_dir)/<(package_name).xml',
-         '<!@(find <(java_in_dir) -name "*.java")'
+        'android/ant/common.xml',
+        'android/ant/chromium-jars.xml',
+        '<(java_in_dir)/<(package_name).xml',
+        '<!@(find <(java_in_dir) -name "*.java")',
+        '>@(input_jars_paths)',
       ],
       'outputs': [
         '<(PRODUCT_DIR)/lib.java/chromium_<(package_name).jar',

chrome/chrome.gyp

@@ -1074,6 +1074,11 @@
             '../content/content.gyp:content_java',
             '../net/net.gyp:net_java',
           ],
+          'export_dependent_settings': [
+            '../base/base.gyp:base_java',
+            '../content/content.gyp:content_java',
+            '../net/net.gyp:net_java',
+          ],
           'variables': {
             'package_name': 'chrome',
             'java_in_dir': '../chrome/android/java',

chrome/chrome_tests.gypi

@@ -4599,18 +4599,12 @@
           'target_name': 'unit_tests_apk',
           'type': 'none',
           'dependencies': [
-            '../base/base.gyp:base_java',
-            '../net/net.gyp:net_java',
             'chrome_java',
             'unit_tests',
           ],
           'variables': {
             'test_suite_name': 'unit_tests',
             'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)unit_tests<(SHARED_LIB_SUFFIX)',
-            'input_jars_paths': [
-              '<(PRODUCT_DIR)/lib.java/chromium_base.jar',
-              '<(PRODUCT_DIR)/lib.java/chromium_net.jar',
-             ],
           },
           'includes': [ '../build/apk_test.gypi' ],
         },

content/content.gyp

@@ -246,6 +246,10 @@
            '../net/net.gyp:net_java',
            'content_common',
          ],
+         'export_dependent_settings': [
+           '../base/base.gyp:base_java',
+           '../net/net.gyp:net_java',
+         ],
          'variables': {
            'package_name': 'content',
            'java_in_dir': '../content/public/android/java',

content/content_tests.gypi

@@ -756,18 +756,13 @@
           'type': 'none',
           'dependencies': [
             '../base/base.gyp:base_java',
+            '../net/net.gyp:net_java',
             'content_java',
             'content_unittests',
-            '../net/net.gyp:net_java',
           ],
           'variables': {
             'test_suite_name': 'content_unittests',
             'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)content_unittests<(SHARED_LIB_SUFFIX)',
-            'input_jars_paths': [
-              '<(PRODUCT_DIR)/lib.java/chromium_base.jar',
-              '<(PRODUCT_DIR)/lib.java/chromium_content.jar',
-              '<(PRODUCT_DIR)/lib.java/chromium_net.jar',
-            ],
           },
           'includes': [ '../build/apk_test.gypi' ],
         },

gpu/gpu_common.gypi

@@ -46,7 +46,6 @@
           'variables': {
             'test_suite_name': 'gpu_unittests',
             'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)gpu_unittests<(SHARED_LIB_SUFFIX)',
-            'input_jars_paths': [ '<(PRODUCT_DIR)/lib.java/chromium_base.jar', ],
           },
           'includes': [ '../build/apk_test.gypi' ],
         },

ipc/ipc.gyp

@@ -138,7 +138,6 @@
           'variables': {
             'test_suite_name': 'ipc_tests',
             'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)ipc_tests<(SHARED_LIB_SUFFIX)',
-            'input_jars_paths': ['<(PRODUCT_DIR)/lib.java/chromium_base.jar',],
           },
           'includes': [ '../build/apk_test.gypi' ],
         }],

media/media.gyp

@@ -1019,17 +1019,12 @@
           'target_name': 'media_unittests_apk',
           'type': 'none',
           'dependencies': [
-            '../base/base.gyp:base_java',
             'media_java',
             'media_unittests',
           ],
           'variables': {
             'test_suite_name': 'media_unittests',
             'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)media_unittests<(SHARED_LIB_SUFFIX)',
-            'input_jars_paths': [
-              '<(PRODUCT_DIR)/lib.java/chromium_base.jar',
-              '<(PRODUCT_DIR)/lib.java/chromium_media.jar',
-             ],
           },
           'includes': [ '../build/apk_test.gypi' ],
         },
@@ -1066,7 +1061,12 @@
         {
           'target_name': 'media_java',
           'type': 'none',
-          'dependencies': [ '../base/base.gyp:base_java' ],
+          'dependencies': [
+            '../base/base.gyp:base_java',
+          ],
+          'export_dependent_settings': [
+            '../base/base.gyp:base_java',
+          ],
           'variables': {
             'package_name': 'media',
             'java_in_dir': 'base/android/java',

net/net.gyp

@@ -1980,6 +1980,9 @@
           'dependencies': [
             '../base/base.gyp:base_java',
           ],
+          'export_dependent_settings': [
+            '../base/base.gyp:base_java',
+          ],
           'includes': [ '../build/java.gypi' ],
         },
       ],
@@ -1993,17 +1996,12 @@
           'target_name': 'net_unittests_apk',
           'type': 'none',
           'dependencies': [
-            '../base/base.gyp:base_java',
             'net_java',
             'net_unittests',
           ],
           'variables': {
             'test_suite_name': 'net_unittests',
             'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)net_unittests<(SHARED_LIB_SUFFIX)',
-            'input_jars_paths': [
-              '<(PRODUCT_DIR)/lib.java/chromium_base.jar',
-              '<(PRODUCT_DIR)/lib.java/chromium_net.jar',
-             ],
           },
           'includes': [ '../build/apk_test.gypi' ],
         },

sql/sql.gyp

@@ -79,7 +79,6 @@
           'variables': {
             'test_suite_name': 'sql_unittests',
             'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)sql_unittests<(SHARED_LIB_SUFFIX)',
-            'input_jars_paths': [ '<(PRODUCT_DIR)/lib.java/chromium_base.jar', ],
           },
           'includes': [ '../build/apk_test.gypi' ],
         },

sync/sync.gyp

@@ -840,7 +840,6 @@
           'variables': {
             'test_suite_name': 'sync_unit_tests',
             'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)sync_unit_tests<(SHARED_LIB_SUFFIX)',
-            'input_jars_paths': [ '<(PRODUCT_DIR)/lib.java/chromium_base.jar', ],
           },
           'includes': [ '../build/apk_test.gypi' ],
         },

ui/ui_unittests.gypi

@@ -245,7 +245,6 @@
           'variables': {
             'test_suite_name': 'ui_unittests',
             'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)ui_unittests<(SHARED_LIB_SUFFIX)',
-            'input_jars_paths': ['<(PRODUCT_DIR)/lib.java/chromium_base.jar',],
           },
           'includes': [ '../build/apk_test.gypi' ],
         },