Include mojo_main_{chromium,standalone}.cc instead of using a target

mojo/mojo_examples.gypi

Index: mojo/mojo_examples.gypi
diff --git a/mojo/mojo_examples.gypi b/mojo/mojo_examples.gypi
index 9fe1f1b49dd1fbc4fbab5d1590d016555b97574e..b29267d0e1bf3a0cb8d09ad506fd02bfc869f3b5 100644
--- a/mojo/mojo_examples.gypi
+++ b/mojo/mojo_examples.gypi
@@ -11,11 +11,11 @@
         # TODO(darin): we should not be linking against these libraries!
         '../ui/events/events.gyp:events',
         '../ui/gfx/gfx.gyp:gfx_geometry',
+        'mojo_application',
         'mojo_cpp_bindings',
         'mojo_environment_standalone',
         'mojo_geometry_bindings',
         'mojo_gles2',
-        'mojo_main_standalone',
         'mojo_native_viewport_bindings',
         'mojo_system',
         'mojo_utility',
@@ -26,6 +26,7 @@
         'examples/sample_app/sample_app.cc',
         'examples/sample_app/spinning_cube.cc',
         'examples/sample_app/spinning_cube.h',
+        'public/cpp/application/lib/mojo_main_standalone.cc',
       ],
     },
     {
@@ -43,13 +44,13 @@
         '../cc/cc.gyp:cc',
         '../ui/gfx/gfx.gyp:gfx',
         '../ui/gfx/gfx.gyp:gfx_geometry',
+        'mojo_application',
         'mojo_cc_support',
         'mojo_common_lib',
         'mojo_environment_chromium',
         'mojo_geometry_bindings',
         'mojo_geometry_lib',
         'mojo_gles2',
-        'mojo_main_chromium',
         'mojo_native_viewport_bindings',
         'mojo_system_impl',
       ],
@@ -57,6 +58,7 @@
         'examples/compositor_app/compositor_app.cc',
         'examples/compositor_app/compositor_host.cc',
         'examples/compositor_app/compositor_host.h',
+        'public/cpp/application/lib/mojo_main_chromium.cc',
       ],
     },
     {
@@ -70,15 +72,16 @@
       'target_name': 'mojo_wget',
       'type': 'shared_library',
       'dependencies': [
+        'mojo_application',
         'mojo_cpp_bindings',
         'mojo_environment_standalone',
-        'mojo_main_standalone',
         'mojo_network_bindings',
         'mojo_system',
         'mojo_utility',
       ],
       'sources': [
         'examples/wget/wget.cc',
+        'public/cpp/application/lib/mojo_main_standalone.cc',
       ],
     },
     {
@@ -98,11 +101,11 @@
         '../ppapi/ppapi.gyp:ppapi_c',
         '../ppapi/ppapi_internal.gyp:ppapi_example_gles2_spinning_cube',
         '../ui/events/events.gyp:events_base',
+        'mojo_application',
         'mojo_common_lib',
         'mojo_environment_chromium',
         'mojo_geometry_bindings',
         'mojo_gles2',
-        'mojo_main_chromium',
         'mojo_native_viewport_bindings',
         'mojo_system_impl',
       ],
@@ -181,6 +184,7 @@
         'examples/pepper_container_app/resource_creation_impl.h',
         'examples/pepper_container_app/thunk.h',
         'examples/pepper_container_app/type_converters.h',
+        'public/cpp/application/lib/mojo_main_chromium.cc',
       ],
     },
   ],
@@ -362,15 +366,16 @@
           'type': 'shared_library',
           'dependencies': [
             '../base/base.gyp:base',
+            'mojo_application',
             'mojo_cpp_bindings',
             'mojo_environment_standalone',
             'mojo_echo_bindings',
-            'mojo_main_standalone',
             'mojo_system',
             'mojo_utility',
           ],
           'sources': [
             'examples/dbus_echo/dbus_echo_app.cc',
+            'public/cpp/application/lib/mojo_main_standalone.cc',
           ],
         },
       ],