[Mojo] Remove dependency between mojo/public and gpu

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.
 
 {
   'variables': {
     'chromium_code': 1,
   },
   'includes': [
     'mojo_apps.gypi',
     'mojo_examples.gypi',
     'mojo_public.gypi',
     'mojo_services.gypi',
   ],
   'targets': [
     {
       'target_name': 'mojo',
       'type': 'none',
       'dependencies': [
-        'hello_world_service_impl',
+        'hello_world_service',
         'mojo_bindings',
         'mojo_bindings_unittests',
         'mojo_common_lib',
         'mojo_common_unittests',
         'mojo_js',
         'mojo_js_unittests',
         'mojo_public_perftests',
         'mojo_public_test_support',
         'mojo_public_unittests',
         'mojo_shell',
@@ skipping 101 matching lines @@
         'system/simple_dispatcher_unittest.cc',
         'system/test_utils.cc',
         'system/test_utils.h',
         'system/waiter_list_unittest.cc',
         'system/waiter_test_utils.cc',
         'system/waiter_test_utils.h',
         'system/waiter_unittest.cc',
       ],
     },
     {
+      'target_name': 'mojo_gles2',
+      'type': '<(component)',
+      'dependencies': [
+        '../gpu/gpu.gyp:gles2_c_lib',
+      ],
+      'defines': [
+        'MOJO_GLES2_IMPLEMENTATION',
+      ],
+      'sources': [
+        'gles2/gles2.cc',
+      ],
+    },
+    {
       'target_name': 'mojo_common_lib',
       'type': '<(component)',
       'defines': [
         'MOJO_COMMON_IMPLEMENTATION',
       ],
       'dependencies': [
         '../base/base.gyp:base',
         '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
         'mojo_system',
       ],
@@ skipping 47 matching lines @@
     },
     {
       'target_name': 'mojo_shell_lib',
       'type': 'static_library',
       'dependencies': [
         '../base/base.gyp:base',
         '../net/net.gyp:net',
         '../url/url.gyp:url_lib',
         'mojo_bindings',
         'mojo_system',
-        'native_viewport_impl',
+        'mojo_native_viewport_service',
       ],
       'sources': [
         'shell/app_container.cc',
         'shell/app_container.h',
         'shell/context.cc',
         'shell/context.h',
         'shell/init.cc',
         'shell/init.h',
         'shell/loader.cc',
         'shell/loader.h',
@@ skipping 40 matching lines @@
             4267,
           ],
         }],
       ],
     },
   ],
   'conditions': [
     ['OS=="android"', {
       'targets': [
         {
-          'target_name': 'native_viewport_java',
+          'target_name': 'mojo_native_viewport_java',
           'type': 'none',
           'dependencies': [
             '../base/base.gyp:base_java',
           ],
           'variables': {
             'java_in_dir': '<(DEPTH)/mojo/services/native_viewport/android',
           },
           'includes': [ '../build/java.gypi' ],
         },
         {
@@ skipping 42 matching lines @@
             'shell/android/mojo_main.cc',
             'shell/android/mojo_main.h',
           ],
         },
         {
           'target_name': 'mojo_shell_apk',
           'type': 'none',
           'dependencies': [
             '../base/base.gyp:base_java',
             '../net/net.gyp:net_java',
-            'native_viewport_java',
+            'mojo_native_viewport_java',
             'libmojo_shell',
           ],
           'variables': {
             'apk_name': 'MojoShell',
             'java_in_dir': '<(DEPTH)/mojo/shell/android/apk',
             'resource_dir': '<(DEPTH)/mojo/shell/android/apk/res',
             'native_lib_target': 'libmojo_shell',
           },
           'includes': [ '../build/java_apk.gypi' ],
         }
       ],
     }],
   ],
 }