Relanding "Add apk for running content_browsertests"

content/content_shell.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.
 
 {
   'variables': {
     'content_shell_product_name': 'Content Shell',
     # The "19" is so that sites that sniff for version think that this is
     # something reasonably current; the "77.34.5" is a hint that this isn't a
     # standard Chrome.
@@ skipping 35 matching lines @@
         '../webkit/support/webkit_support.gyp:webkit_resources',
         '../webkit/support/webkit_support.gyp:webkit_support',
         '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit',
         '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit_test_support',
         '<(webkit_src_dir)/Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp:TestRunner',
       ],
       'include_dirs': [
         '..',
       ],
       'sources': [
+        'shell/android/shell_jni_registrar.cc',
+        'shell/android/shell_jni_registrar.h',
+        'shell/android/shell_manager.cc',
+        'shell/android/shell_manager.h',
         'shell/geolocation/shell_access_token_store.cc',
         'shell/geolocation/shell_access_token_store.h',
         'shell/minimal_ash.cc',
         'shell/minimal_ash.h',
         'shell/paths_mac.h',
         'shell/paths_mac.mm',
         'shell/shell.cc',
         'shell/shell.h',
         'shell/shell_android.cc',
         'shell/shell_aura.cc',
@@ skipping 485 matching lines @@
       ],
     }],  # OS=="mac"
     ['OS=="android"', {
       'targets': [
         {
           # TODO(jrg): Update this action and other jni generators to only
           # require specifying the java directory and generate the rest.
           'target_name': 'content_shell_jni_headers',
           'type': 'none',
           'sources': [
+            'shell/android/browsertests_apk/src/org/chromium/content_browsertests_apk/ContentBrowserTestsActivity.java',
             'shell/android/java/src/org/chromium/content_shell/ShellManager.java',
             'shell/android/java/src/org/chromium/content_shell/Shell.java',
           ],
           'direct_dependent_settings': {
             'include_dirs': [
               '<(SHARED_INTERMEDIATE_DIR)/content/shell',
             ],
           },
           'variables': {
             'jni_gen_dir': 'content/shell',
           },
           'includes': [ '../build/jni_generator.gypi' ],
         },
         {
           'target_name': 'libcontent_shell_content_view',
           'type': 'shared_library',
           'dependencies': [
             'content_shell_jni_headers',
             'content_shell_lib',
             'content_shell_pak',
             # Skia is necessary to ensure the dependencies needed by
             # WebContents are included.
             '../skia/skia.gyp:skia',
             '<(DEPTH)/media/media.gyp:player_android',
           ],
           'sources': [
             'shell/android/shell_library_loader.cc',
             'shell/android/shell_library_loader.h',
-            'shell/android/shell_manager.cc',
-            'shell/android/shell_manager.h',
-          ],
-          'sources!': [
-            'shell/shell_main.cc',
-            'shell/shell_main.h',
           ],
           'conditions': [
             ['android_build_type==1', {
               'ldflags': [
                 '-lgabi++',  # For rtti
               ],
             }],
           ],
         },
         {
+          'target_name': 'content_shell_java',
+          'type': 'none',
+          'dependencies': [
+            'content_java',
+          ],
+          'variables': {
+            'package_name': 'content_shell',
+            'java_in_dir': '../content/shell/android/java',
+            'has_java_resources': 1,
+            'R_package': 'org.chromium.content_shell',
+            'R_package_relpath': 'org/chromium/content_shell',
+          },
+          'includes': [ '../build/java.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. Dependents of content_shell_apk receive its jar
-          # path in the variable 'apk_output_jar_path'.
-          'target_name': 'content_shell_java',
+          # content_shell_apk_java. Dependents of content_shell_apk receive its
+          # jar path in the variable 'apk_output_jar_path'. This target should
+          # only be used by targets which instrument content_shell_apk.
+          'target_name': 'content_shell_apk_java',
           'type': 'none',
           'dependencies': [
             'content_shell_apk',
           ],
           # 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': ['>(apk_output_jar_path)'],
             },
           },
           # Add an action with the appropriate output. This allows the generated
           # buildfiles to determine which target the output corresponds to.
           'actions': [
             {
               'action_name': 'fake_generate_jar',
               'inputs': [],
               'outputs': ['>(apk_output_jar_path)'],
               'action': [],
             },
           ],
         },
         {
           'target_name': 'content_shell_apk',
           'type': 'none',
           'dependencies': [
             'content_java',
+            'content_shell_java',
+            'libcontent_shell_content_view',
             '../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',
+            'package_name': 'content_shell_apk',
             'apk_name': 'ContentShell',
-            'manifest_package_name': 'org.chromium.content_shell',
-            'java_in_dir': 'shell/android/java',
-            # TODO(cjhopman): The resource directory of all apks should be in
-            # <java_in_dir>/res.
-            'resource_dir': '../res',
+            'manifest_package_name': 'org.chromium.content_shell_apk',
+            'java_in_dir': 'shell/android/shell_apk',
+            'resource_dir': 'res',
             'native_libs_paths': ['<(SHARED_LIB_DIR)/libcontent_shell_content_view.so'],
             'additional_input_paths': ['<(PRODUCT_DIR)/content_shell/assets/content_shell.pak'],
+            'asset_location': '<(ant_build_out)/content_shell/assets',
           },
           'includes': [ '../build/java_apk.gypi' ],
         },
       ],
     }],  # OS=="android"
   ]
 }