[Mojo] Remove dependency between mojo/public and gpu

mojo/mojo.gyp

Index: mojo/mojo.gyp
diff --git a/mojo/mojo.gyp b/mojo/mojo.gyp
index 015a9d8b0c8f9641e0d9326bbe911b54d4ff306d..ef60860af2485e3978d13effe7ad0f961854367f 100644
--- a/mojo/mojo.gyp
+++ b/mojo/mojo.gyp
@@ -16,7 +16,7 @@
       'target_name': 'mojo',
       'type': 'none',
       'dependencies': [
-        'hello_world_service_impl',
+        'hello_world_service',
         'mojo_bindings',
         'mojo_bindings_unittests',
         'mojo_common_lib',
@@ -136,6 +136,19 @@
       ],
     },
     {
+      'target_name': 'mojo_gles2',
+      'type': '<(component)',
+      'dependencies': [
+        '../gpu/gpu.gyp:gles2_c_lib',
+      ],
+      'defines': [
+        'MOJO_GLES2_IMPLEMENTATION',
+      ],
+      'sources': [
+        'gles2/adaptor.cc',
+      ],
+    },
+    {
       'target_name': 'mojo_common_lib',
       'type': '<(component)',
       'defines': [
@@ -202,7 +215,7 @@
         '../url/url.gyp:url_lib',
         'mojo_bindings',
         'mojo_system',
-        'native_viewport_impl',
+        'mojo_native_viewport_service',
       ],
       'sources': [
         'shell/app_container.cc',
@@ -264,7 +277,7 @@
       'dependencies': [
         '../base/base.gyp:base',
         '../gin/gin.gyp:gin',
-        'hello_world_service',
+        'hello_world_bindings',
         'mojo_common_lib',
         'mojo_js_bindings',
         'mojo_system',
@@ -282,7 +295,7 @@
     ['OS=="android"', {
       'targets': [
         {
-          'target_name': 'native_viewport_java',
+          'target_name': 'mojo_native_viewport_java',
           'type': 'none',
           'dependencies': [
             '../base/base.gyp:base_java',
@@ -345,7 +358,7 @@
           'dependencies': [
             '../base/base.gyp:base_java',
             '../net/net.gyp:net_java',
-            'native_viewport_java',
+            'mojo_native_viewport_java',
             'libmojo_shell',
           ],
           'variables': {