Implement the skeleton of an android content shell.

content/content_shell.gypi

Index: content/content_shell.gypi
diff --git a/content/content_shell.gypi b/content/content_shell.gypi
index 0556fe52928dfa243d690f0c7c43a050b21e9c93..d7f4633ff15874e3f4f8a72ec6d8bd627f01d399 100644
--- a/content/content_shell.gypi
+++ b/content/content_shell.gypi
@@ -41,7 +41,6 @@
         '../webkit/support/webkit_support.gyp:fileapi',
         '../webkit/support/webkit_support.gyp:glue',
         '../webkit/support/webkit_support.gyp:quota',
-        '../webkit/support/webkit_support.gyp:webkit_support',
       ],
       'include_dirs': [
         '..',
@@ -53,6 +52,7 @@
         'shell/paths_mac.mm',
         'shell/shell.cc',
         'shell/shell.h',
+        'shell/shell_android.cc',
         'shell/shell_aura.cc',
         'shell/shell_gtk.cc',
         'shell/shell_mac.mm',
@@ -65,6 +65,8 @@
         'shell/shell_browser_main.h',
         'shell/shell_browser_main_parts.cc',
         'shell/shell_browser_main_parts.h',
+        'shell/shell_browser_main_parts_android.cc',
+        'shell/shell_browser_main_parts_android.h',
         'shell/shell_browser_main_parts_mac.mm',
         'shell/shell_content_browser_client.cc',
         'shell/shell_content_browser_client.h',
@@ -90,6 +92,8 @@
         'shell/shell_login_dialog.h',
         'shell/shell_main_delegate.cc',
         'shell/shell_main_delegate.h',
+        'shell/shell_main_delegate_android.cc',
+        'shell/shell_main_delegate_android.h',
         'shell/shell_messages.cc',
         'shell/shell_messages.h',
         'shell/shell_network_delegate.cc',
@@ -138,6 +142,13 @@
             },
           },
         }],  # OS=="win"
+        ['OS!="android"', {
+          'dependencies': [
+            # This dependency is for running DRT against the content shell, and

[John Grabowski, 2012/04/19 18:55:27]

Not sure I understand the comment.
We need this dep, yes?  But it doesn't work yet?

[Ted C, 2012/04/19 23:21:07]

We don't need this dep yet because I #ifdef'd out the DRT specific code from
content shell.

I'm not sure what the plan is for DRT in the future, so we need to evaluate
whether we will ever need this.

+            # this combination is not yet supported on Android.
+            '../webkit/support/webkit_support.gyp:webkit_support',
+          ],
+        }],  # OS!="android"
         ['use_aura==1', {
           'sources/': [
             ['exclude', 'shell/shell_gtk.cc'],
@@ -222,11 +233,19 @@
             '<(repack_path)',
             '<@(pak_inputs)',
           ],
-          'outputs': [
-            '<(PRODUCT_DIR)/content_shell.pak',
-          ],
           'action': ['python', '<(repack_path)', '<@(_outputs)',
                      '<@(pak_inputs)'],
+          'conditions': [
+            ['OS!="android"', {
+              'outputs': [
+                '<(PRODUCT_DIR)/content_shell.pak',
+              ],
+            }, {
+              'outputs': [
+                '<(PRODUCT_DIR)/content_shell/assets/content_shell.pak',
+              ],
+            }],
+          ],
         },
       ],
     },
@@ -462,10 +481,69 @@
     ['OS=="android"', {
       'targets': [
         {
+          'target_name': 'content_shell_jni_headers',
+          'type': 'none',
+          'variables': {
+            'java_sources': [
+              'shell/android/java/org/chromium/content_shell/ShellManager.java',

[John Grabowski, 2012/04/19 18:55:27]

find . -name *.java
Note plans (by yaron?) to update the jni generator script to only require a
dirname; add TODO here for that work

[Ted C, 2012/04/19 23:21:07]

Done.

+              'shell/android/java/org/chromium/content_shell/ShellView.java',
+            ],
+            'jni_headers': [
+              '<(SHARED_INTERMEDIATE_DIR)/content/shell/jni/shell_manager_jni.h',
+              '<(SHARED_INTERMEDIATE_DIR)/content/shell/jni/shell_view_jni.h',
+            ],
+          },
+          'includes': [ '../build/jni_generator.gypi' ],
+        },
+        {
+          'target_name': 'content_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',
+          ],
+          'include_dirs': [
+            '<(SHARED_INTERMEDIATE_DIR)/content/shell',
+          ],
+          'sources': [
+            'shell/android/shell_library_loader.cc',
+            'shell/android/shell_library_loader.h',
+            'shell/android/shell_manager.cc',
+            'shell/android/shell_manager.h',
+            'shell/android/shell_view.cc',
+            'shell/android/shell_view.h',
+          ],
+        },
+        {
           'target_name': 'content_shell_apk',
           'type': 'none',
+          # TODO(tedchoc): Add a dependency on content_shell_content_view once
+          # it links.
           'actions': [
             {
+              'action_name': 'copy_base_jar',

[John Grabowski, 2012/04/19 18:55:27]

make single action which copies all jars
update jar dest to be in $(PRODUCT_DIR) [apk CL stuff]

[Ted C, 2012/04/19 23:21:07]

I'd rather be explicit about what jars are needed so when we start adding chrome
jar files at some point, they will not trickle into the content shell and allow
for sloppy dependencies.

Unless of course there is a copy action that allows for multiple inputs and a
single output folder.

+              'dependencies': [
+                '<(DEPTH)/base/base.gyp:base_java',
+              ],
+              'inputs': ['<(DEPTH)/base/android/java/dist/lib/chromium_base.jar'],
+              'outputs': ['<(PRODUCT_DIR)/content_shell/java/libs/chromium_base.jar'],
+              'action': ['cp', '<@(_inputs)', '<@(_outputs)'],
+            },
+            {
+              'action_name': 'copy_content_jar',
+              'dependencies': [
+                '<(DEPTH)/content/content.gyp:content_java',
+              ],
+              'inputs': ['<(DEPTH)/content/android/java/dist/lib/chromium_content.jar'],
+              'outputs': ['<(PRODUCT_DIR)/content_shell/java/libs/chromium_content.jar'],
+              'action': ['cp', '<@(_inputs)', '<@(_outputs)'],
+            },
+            {
               'action_name': 'content_shell_apk',
               'inputs': [
                 '<(DEPTH)/content/shell/android/content_shell_apk.xml',
@@ -478,6 +556,10 @@
                 # fixed.
                 '<(PRODUCT_DIR)/ContentShell-debug.apk',
               ],
+              'dependencies': [
+                'copy_base_jar',
+                'copy_content_jar',
+              ],
               'action': [
                 'ant',
                 '-DPRODUCT_DIR=<(PRODUCT_DIR)',