Create native_viewport_service, don't build it into mojo_shell unless Android

mojo/mojo.gyp

 # Copyright 2013 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.
 
 {
   'target_defaults': {
     'conditions': [
       ['mojo_shell_debug_url != ""', {
         'defines': [
           'MOJO_SHELL_DEBUG=1',
@@ skipping 20 matching lines @@
         'mojo_compositor_app',
         'mojo_content_handler_demo',
         'mojo_echo_client',
         'mojo_echo_service',
         'mojo_example_apptests',
         'mojo_example_service',
         'mojo_geometry_lib',
         'mojo_html_viewer',
         'mojo_js',
         'mojo_launcher',
-        'mojo_native_viewport_service_lib',
+        'mojo_native_viewport_service',
         'mojo_network_service',
         'mojo_pepper_container_app',
         'mojo_png_viewer',
         'mojo_sample_app',
         'mojo_shell',
         'mojo_shell_lib',
         'mojo_shell_tests',
         'mojo_surfaces_app',
         'mojo_surfaces_app',
         'mojo_surfaces_child_app',
@@ skipping 86 matching lines @@
         '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
         '../net/net.gyp:net',
         '../url/url.gyp:url_lib',
         'mojo_application_manager',
         'mojo_base.gyp:mojo_application_bindings',
         'mojo_base.gyp:mojo_common_lib',
         'mojo_base.gyp:mojo_gles2_impl',
         'mojo_base.gyp:mojo_system_impl',
         'mojo_base.gyp:mojo_application_chromium',
         'mojo_external_service_bindings',
-        'mojo_native_viewport_service_lib',
         'mojo_network_bindings',
         'mojo_spy',
       ],
       'includes': [ 'public/tools/bindings/mojom_bindings_generator.gypi' ],
       'sources': [
         'shell/app_child_process.cc',
         'shell/app_child_process.h',
         'shell/app_child_process.mojom',
         'shell/app_child_process_host.cc',
         'shell/app_child_process_host.h',
@@ skipping 34 matching lines @@
       'conditions': [
         ['OS=="linux"', {
           'dependencies': [
             '../build/linux/system.gyp:dbus',
             '../dbus/dbus.gyp:dbus',
           ],
         }],
         ['OS=="android"', {
           'dependencies': [
             'mojo_network_service_lib',
+            'mojo_native_viewport_service_lib',
           ],
           'sources': [
             'shell/network_application_loader.cc',
             'shell/network_application_loader.h',
           ],
         }],
         ['use_aura==1', {
           'dependencies': [
             # These are only necessary as long as we hard code use of ViewManager.
             '../skia/skia.gyp:skia',
@@ skipping 308 matching lines @@
             'views/views_init_internal.h',
           ],
           'defines': [
             'MOJO_VIEWS_IMPLEMENTATION',
           ],
         },
       ],
     }],
   ],
 }