Build mojo_shell on Android

mojo/mojo.gyp

Index: mojo/mojo.gyp
diff --git a/mojo/mojo.gyp b/mojo/mojo.gyp
index b4d2f665520d3157dc9fc02ce9647c5e517033e1..b34d4d2f6f36e7b3dd51afc7d10e97b676555b9c 100644
--- a/mojo/mojo.gyp
+++ b/mojo/mojo.gyp
@@ -132,8 +132,8 @@
       ],
     },
     {
-      'target_name': 'mojo_shell',
-      'type': 'executable',
+      'target_name': 'mojo_shell_lib',
+      'type': 'static_library',
       'dependencies': [
         '../base/base.gyp:base',
         '../net/net.gyp:net',
@@ -149,7 +149,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',
@@ -167,6 +166,27 @@
       ],
     },
     {
+      'target_name': 'mojo_shell',
+      'type': 'executable',
+      'dependencies': [
+        '../base/base.gyp:base',
+        '../url/url.gyp:url_lib',
+        'mojo_shell_lib',
+        'mojo_system',
+      ],
+      'sources': [
+        'shell/shell.cc',
+      ],
+      'conditions': [
+        ['OS == "win"', {
+          # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
+          'msvs_disabled_warnings': [
+            4267,
+          ],
+        }],
+      ],
+    },
+    {
       'target_name': 'sample_app',
       'type': '<(component)',
       'dependencies': [
@@ -214,4 +234,37 @@
       ],
     },
   ],
+  'conditions': [
+    ['OS=="android"', {
+      'targets': [
+        {
+          'target_name': 'libmojo_shell',
+          'type': 'shared_library',
+          'dependencies': [
+            '../base/base.gyp:base',
+            'mojo_shell_lib',
+          ],
+          'sources': [
+            'shell/android/library_loader.cc',
+          ],
+        },
+        {
+          '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' ],
+        }
+      ],
+    }],
+  ],
 }