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

mojo/mojo_examples.gypi

 # 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.
 
 {
   'targets': [
     {
       # GN version: //mojo/examples/echo:client
       'target_name': 'mojo_echo_client',
       'type': 'loadable_module',
@@ skipping 63 matching lines @@
         'mojo_geometry_bindings',
         'mojo_gpu_bindings',
         'mojo_native_viewport_bindings',
         '<(mojo_system_for_loadable_module)',
       ],
       'includes': [
         'mojo_public_gles2_for_loadable_module.gypi',
       ],
       'sources': [
         'examples/sample_app/gles2_client_impl.cc',
-        'examples/sample_app/gles2_client_impl.h',
+        'examples/sample_app/gles2_client_impl.cc',
         'examples/sample_app/sample_app.cc',
         'examples/sample_app/spinning_cube.cc',
         'examples/sample_app/spinning_cube.h',
       ],
     },
     {
       'target_name': 'package_mojo_sample_app',
       'variables': {
         'app_name': 'mojo_sample_app',
       },
@@ skipping 449 matching lines @@
           'includes': [ 'build/package_app.gypi' ],
         },
         {
           'target_name': 'mojo_demo_launcher',
           'type': 'loadable_module',
           'dependencies': [
             '../base/base.gyp:base',
             '../skia/skia.gyp:skia',
             '../ui/gfx/gfx.gyp:gfx',
             '../ui/gfx/gfx.gyp:gfx_geometry',
+            '../ui/gl/gl.gyp:gl',
             'mojo_base.gyp:mojo_application_chromium',
             'mojo_base.gyp:mojo_cpp_bindings',
             'mojo_base.gyp:mojo_utility',
             'mojo_geometry_bindings',
             'mojo_view_manager_bindings',
             '<(mojo_system_for_loadable_module)',
           ],
           'includes': [
             'mojo_public_gles2_for_loadable_module.gypi',
           ],
@@ skipping 71 matching lines @@
         },
         {
           'target_name': 'mojo_window_manager',
           'type': 'loadable_module',
           'dependencies': [
             '../base/base.gyp:base',
             '../ui/aura/aura.gyp:aura',
             '../ui/base/ui_base.gyp:ui_base',
             '../ui/gfx/gfx.gyp:gfx',
             '../ui/gfx/gfx.gyp:gfx_geometry',
+            '../ui/gl/gl.gyp:gl',
             '../ui/resources/ui_resources.gyp:ui_resources',
             '../ui/resources/ui_resources.gyp:ui_test_pak',
             '../ui/views/views.gyp:views',
             'mojo_base.gyp:mojo_application_chromium',
             'mojo_base.gyp:mojo_cpp_bindings',
             'mojo_base.gyp:mojo_utility',
             'mojo_aura_support',
             'mojo_core_window_manager_lib',
             'mojo_geometry_bindings',
             'mojo_geometry_lib',
@@ skipping 13 matching lines @@
             'examples/window_manager/debug_panel.cc',
             'examples/window_manager/window_manager.cc',
           ],
         },
         {
           'target_name': 'mojo_embedded_app',
           'type': 'loadable_module',
           'dependencies': [
             '../base/base.gyp:base',
             '../ui/gfx/gfx.gyp:gfx_geometry',
+            '../ui/gl/gl.gyp:gl',
             '../url/url.gyp:url_lib',
             'mojo_base.gyp:mojo_application_chromium',
             'mojo_base.gyp:mojo_cpp_bindings',
             'mojo_base.gyp:mojo_utility',
             'mojo_geometry_bindings',
             'mojo_navigation_bindings',
             'mojo_view_manager_lib',
             'mojo_window_manager_bindings',
             '<(mojo_system_for_loadable_module)',
           ],
           'includes': [
             'mojo_public_gles2_for_loadable_module.gypi',
           ],
           'sources': [
             'examples/embedded_app/embedded_app.cc',
           ],
         },
         {
           'target_name': 'mojo_nesting_app',
           'type': 'loadable_module',
           'dependencies': [
             '../base/base.gyp:base',
             '../ui/gfx/gfx.gyp:gfx_geometry',
+            '../ui/gl/gl.gyp:gl',
             '../url/url.gyp:url_lib',
             'mojo_base.gyp:mojo_application_chromium',
             'mojo_base.gyp:mojo_cpp_bindings',
             'mojo_base.gyp:mojo_utility',
             'mojo_geometry_bindings',
             'mojo_navigation_bindings',
             'mojo_view_manager_lib',
             'mojo_window_manager_bindings',
             '<(mojo_system_for_loadable_module)',
           ],
@@ skipping 151 matching lines @@
           ],
           'sources': [
             'examples/dbus_echo/dbus_echo_service.cc',
           ],
         },
       ],
 
     }],
   ],
 }