Build mojo_shell on Android

mojo/mojo.gyp

Index: mojo/mojo.gyp
diff --git a/mojo/mojo.gyp b/mojo/mojo.gyp
index 9262cff2969b69164dc0ae016d523728ec21c6d2..14d08fb0a905fcdbf83dc9b584ebd3fdaee53f5c 100644
--- a/mojo/mojo.gyp
+++ b/mojo/mojo.gyp
@@ -131,8 +131,8 @@
       ],
     },
     {
-      'target_name': 'mojo_shell',
-      'type': 'executable',
+      'target_name': 'mojo_shell_lib',
+      'type': 'static_library',
       'dependencies': [
         '../base/base.gyp:base',
         '../net/net.gyp:net',
@@ -148,7 +148,6 @@
         'loader/url_request_context_getter.h',
         'shell/app_container.cc',
         'shell/app_container.h',
-        'shell/shell.cc',
         'shell/storage.cc',
         'shell/storage.h',
         'shell/switches.cc',
@@ -166,17 +165,49 @@
       ],
     },
     {
-      'target_name': 'sample_app',
-      'type': '<(component)',
+      'target_name': 'mojo_shell',
+      'type': 'executable',
       'dependencies': [
         '../base/base.gyp:base',
+        '../url/url.gyp:url_lib',
+        'mojo_shell_lib',
         'mojo_system',
       ],
       'sources': [
-        'shell/sample_app.cc',
+        'shell/shell.cc',
+      ],
+      'conditions': [
+        ['OS == "win"', {
+          # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
+          'msvs_disabled_warnings': [
+            4267,
+          ],
+        }],
+      ],
+    },
+    {
+      'target_name': 'libmojo_shell',
+      'type': 'shared_library',
+      'dependencies': [
+        '../base/base.gyp:base',
+        'mojo_shell_lib',
+      ],
+      'sources': [
+        'shell/android/shell_library_loader.cc',
       ],
     },
     {
+        'target_name': 'sample_app',

[darin (slow to review), 2013/10/24 03:52:47]

nit: indentation

+        'type': '<(component)',
+        'dependencies': [
+          '../base/base.gyp:base',
+          'mojo_system',
+        ],
+        'sources': [
+          'shell/sample_app.cc',
+        ],
+    },
+    {
       'target_name': 'mojo_bindings',
       'type': 'static_library',
       'include_dirs': [
@@ -213,4 +244,26 @@
       ],
     },
   ],
+  'conditions': [
+    ['OS=="android"', {
+      'targets': [
+        {
+          'target_name': 'mojo_shell_apk',
+          'type': 'none',
+          'dependencies': [
+            '../base/base.gyp:base_java',
+            '../net/net.gyp:net_java',
+            'libmojo_shell',
+          ],
+          'variables': {
+            'apk_name': 'MojoShell',
+            'java_in_dir': '<(DEPTH)/mojo/shell/android/shell_apk',
+            'resource_dir': '<(DEPTH)/mojo/shell/android/shell_apk/res',
+            'native_lib_target': 'libmojo_shell',
+          },
+          'includes': [ '../build/java_apk.gypi' ],
+        }
+      ],
+    }],
+  ],
 }