Upstream JavaBridge tests.

content/content_shell.gypi

Index: content/content_shell.gypi
diff --git a/content/content_shell.gypi b/content/content_shell.gypi
index 059e93af12d7ea3f89bcf039f54fd5d5261760af..093a5e4cfbdd181d79f6aa565d8c501a3e336421 100644
--- a/content/content_shell.gypi
+++ b/content/content_shell.gypi
@@ -596,42 +596,6 @@
           ],
         },
         {
-          'target_name': 'content_shell_apk',
-          'type': 'none',
-          'dependencies': [
-            'content_java',
-            '../base/base.gyp:base_java',
-            '../media/media.gyp:media_java',
-            '../net/net.gyp:net_java',
-            '../ui/ui.gyp:ui_java',
-          ],
-          'variables': {
-            'package_name': 'content_shell',
-            'apk_name': 'ContentShell',
-            'java_in_dir': 'shell/android/java',
-            # TODO(cjhopman): The resource directory of all apks should be in
-            # <java_in_dir>/res.
-            'resource_dir': '../res',
-            'native_libs_paths': ['<(PRODUCT_DIR)/content_shell/libs/<(android_app_abi)/libcontent_shell_content_view.so'],
-            'additional_input_paths': ['<(PRODUCT_DIR)/content_shell/assets/content_shell.pak'],
-          },
-          'actions': [
-            {
-              'action_name': 'copy_and_strip_so',
-              'inputs': ['<(SHARED_LIB_DIR)/libcontent_shell_content_view.so'],
-              'outputs': ['<(PRODUCT_DIR)/content_shell/libs/<(android_app_abi)/libcontent_shell_content_view.so'],
-              'action': [
-                '<(android_strip)',
-                '--strip-unneeded',  # All symbols not needed for relocation.
-                '<@(_inputs)',
-                '-o',
-                '<@(_outputs)',
-              ],
-            },
-          ],
-          'includes': [ '../build/java_apk.gypi' ],
-        },
-        {
           # 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.
@@ -671,6 +635,42 @@
             },
           ],
         },
+        {
+          'target_name': 'content_shell_apk',
+          'type': 'none',
+          'dependencies': [
+            'content_java',
+            '../base/base.gyp:base_java',
+            '../media/media.gyp:media_java',
+            '../net/net.gyp:net_java',
+            '../ui/ui.gyp:ui_java',
+          ],
+          'variables': {
+            'package_name': 'content_shell',
+            'apk_name': 'ContentShell',
+            'java_in_dir': 'shell/android/java',
+            # TODO(cjhopman): The resource directory of all apks should be in
+            # <java_in_dir>/res.
+            'resource_dir': '../res',
+            'native_libs_paths': ['<(PRODUCT_DIR)/content_shell/libs/<(android_app_abi)/libcontent_shell_content_view.so'],
+            'additional_input_paths': ['<(PRODUCT_DIR)/content_shell/assets/content_shell.pak'],
+          },
+          'actions': [
+            {
+              'action_name': 'copy_and_strip_so',
+              'inputs': ['<(SHARED_LIB_DIR)/libcontent_shell_content_view.so'],
+              'outputs': ['<(PRODUCT_DIR)/content_shell/libs/<(android_app_abi)/libcontent_shell_content_view.so'],
+              'action': [
+                '<(android_strip)',
+                '--strip-unneeded',  # All symbols not needed for relocation.
+                '<@(_inputs)',
+                '-o',
+                '<@(_outputs)',
+              ],
+            },
+          ],
+          'includes': [ '../build/java_apk.gypi' ],
+        },
       ],
     }],  # OS=="android"
   ]