GN: Mojo wget, sample_app, surfaces app and component build

mojo/shell/BUILD.gn

 # Copyright 2014 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.
 
 import("//mojo/public/tools/bindings/mojom.gni")
 import("//build/config/ui.gni")
 
 executable("mojo_shell") {
   deps = [
     ":lib",
     "//base",
     "//mojo/common",
     "//mojo/environment:chromium",
     "//mojo/application_manager",
     "//mojo/system",
     "//third_party/icu",
     "//ui/gl",
     "//url",
   ]
 
   if (use_ozone) {
     deps += [ "//ui/ozone" ]
   }
 
   sources = [
     "desktop/mojo_main.cc"
   ]
 }
+
+# GYP version: mojo/mojo.gyp:mojo_shell_lib
 source_set("lib") {
   deps = [
     ":app_child_process_bindings",
     ":external_service_bindings",
     "//base",
     "//base/third_party/dynamic_annotations",
     "//base:base_static",
     "//mojo/application_manager",
     "//mojo/common",
     "//mojo/gles2",
     "//mojo/public/cpp/application:chromium",
-    "//mojo/public/gles2",
     "//mojo/public/interfaces/application",
     "//mojo/services/native_viewport",
     "//mojo/services/public/interfaces/native_viewport",
     "//mojo/services/public/interfaces/network",
     "//mojo/spy",
     "//mojo/system",
     "//net",
     "//url",
   ]
 
@@ skipping 34 matching lines @@
     "ui_application_loader_android.cc",
     "ui_application_loader_android.h",
   ]
 
   if (is_linux) {
     deps += [
       "//dbus"
     ]
   } else if (is_android) {
     deps += [
-      "//mojo/services/network",
+      "//mojo/services/network:lib",
     ]
     sources += [
       "network_application_loader.cc",
       "network_application_loader.h",
     ]
   }
   if (use_aura) {
     deps += [
       # These are only necessary as long as we hard code use of ViewManager.
       "//skia",
@@ skipping 50 matching lines @@
     "shell_test_main.cc",
   ]
 
   if (is_android) {
     deps += [
       # TODO(GYP):
       #'../testing/android/native_test.gyp:native_test_native_code',
     ]
   }
 }