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..f4c33d1bdd5d3180c335f37a8ce7616cc7b69b81 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',
+        '<(mojo_main_standalone)',
       ],
     },
     {
@@ -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',
+        '<(mojo_main_chromium)',
       ],
     },
     {
@@ -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',
+        '<(mojo_main_standalone)',
       ],
     },
     {
@@ -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',
+        '<(mojo_main_chromium)',
       ],
     },
   ],
@@ -213,7 +217,7 @@
             'examples/aura_demo/window_tree_host_view_manager.cc',
             'examples/aura_demo/window_tree_host_view_manager.h',
             'examples/aura_demo/aura_demo.cc',
-            'public/cpp/application/lib/mojo_main_chromium.cc',
+            '<(mojo_main_chromium)',
           ],
         },
         {
@@ -228,7 +232,7 @@
           ],
           'sources': [
             'examples/aura_demo/view_manager_init.cc',
-            'public/cpp/application/lib/mojo_main_chromium.cc',
+            '<(mojo_main_chromium)',
           ],
         },
         {
@@ -308,7 +312,7 @@
           ],
           'sources': [
             'examples/demo_launcher/demo_launcher.cc',
-            'public/cpp/application/lib/mojo_main_chromium.cc',
+            '<(mojo_main_chromium)',
           ],
         },
         {
@@ -329,7 +333,7 @@
           ],
           'sources': [
             'examples/window_manager/window_manager.cc',
-            'public/cpp/application/lib/mojo_main_chromium.cc',
+            '<(mojo_main_chromium)',
           ],
         },
         {
@@ -350,7 +354,7 @@
           ],
           'sources': [
             'examples/embedded_app/embedded_app.cc',
-            'public/cpp/application/lib/mojo_main_chromium.cc',
+            '<(mojo_main_chromium)',
           ],
         },
       ],
@@ -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',
+            '<(mojo_main_standalone)',

[darin (slow to review), 2014/06/05 18:02:47]

why not just path/to/mojo_main_standalone.cc? wouldn't that be a lot easier to
read?

[jamesr, 2014/06/05 18:12:18]

+infinity.  using a gyp variable makes things really really complicated,
especially if the person making the application wants to do something else (like
define sources list in their own variable or in a gypi) where they have to start
fighting gyp variable expansion rules.  Just have people list out the source
file in the sources list.

[DaveMoore, 2014/06/05 20:18:42]

Done.

[DaveMoore, 2014/06/05 20:18:42]

Done.

           ],
         },
       ],