Upstream JavaBridge tests.

content/content_tests.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.
 
 {
   'targets': [
     {
       'target_name': 'test_support_content',
       'type': 'static_library',
       'defines!': ['CONTENT_IMPLEMENTATION'],
@@ skipping 845 matching lines @@
             'test_suite_name': 'content_unittests',
             'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)content_unittests<(SHARED_LIB_SUFFIX)',
           },
           'includes': [ '../build/apk_test.gypi' ],
         },
       ],
     }],
     ['OS == "android"', {
       'targets': [
         {
-          'target_name': 'content_javatests',
-          'type': 'none',
-          'dependencies': [
-            '../base/base.gyp:base',
-            '../base/base.gyp:base_java_test_support',
-            'content_common',
-            'content_java',
-          ],
-          'variables': {
-            'package_name': 'content_javatests',
-            'java_in_dir': '../content/public/android/javatests',
-          },
-          'includes': [ '../build/java.gypi' ],
-        },
-        {
           'target_name': 'content_java_test_support',
           'type': 'none',
           'dependencies': [
             '../base/base.gyp:base',
             '../base/base.gyp:base_java_test_support',
             'content_common',
             'content_java',
           ],
           'variables': {
             'package_name': 'content_java_test_support',
             'java_in_dir': '../content/public/test/android/javatests',
           },
           'includes': [ '../build/java.gypi' ],
         },
         {
           'target_name': 'content_shell_test_apk',
           'type': 'none',
           'dependencies': [
             'content_java',
-            'content_javatests',
+            'content_java_test_support',
             'content_shell_apk',
             '../base/base.gyp:base_java',
             '../base/base.gyp:base_java_test_support',
             '../media/media.gyp:media_java',
             '../media/media.gyp:media_test_support',
             '../net/net.gyp:net_java',
             '../net/net.gyp:net_javatests',
             '../tools/android/forwarder/forwarder.gyp:forwarder',
           ],
           'variables': {
             'package_name': 'content_shell_test',
             'apk_name': 'ContentShellTest',
-            'java_in_dir': 'shell/android/javatests',
+            'java_in_dir': '../content/shell/android/javatests',
             'resource_dir': '../res',
+            'additional_input_paths': ['<!@(find ../content/public/android/javatests/src -name "*.java")',],
           },
           'includes': [ '../build/java_apk.gypi' ],
         },
       ],
     }],
   ],
 }