Move GLES2, GPU & Surfaces into the ViewManager directory. This does not merge the applications, th…

components/view_manager/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("//build/config/ui.gni")
 import("//testing/test.gni")
 import("//third_party/mojo/src/mojo/public/mojo_application.gni")
 
 if (is_android) {
   import("//build/config/android/config.gni")
   import("//build/config/android/rules.gni")
 
   group("view_manager") {
     deps = [
       ":jni_headers",
+      ":lib",
       ":loader",
-      ":view_manager_lib",
       ":view_manager_java",
       "native_viewport",
     ]
   }
 
   android_library("view_manager_java") {
     java_files = [ "native_viewport/android/src/org/chromium/mojo/PlatformViewportAndroid.java" ]
 
     deps = [
       "//base:base_java",
@@ skipping 19 matching lines @@
       "//third_party/mojo/src/mojo/public/cpp/bindings",
     ]
   }
 } else {
   mojo_native_application("view_manager") {
     sources = [
       "main.cc",
     ]
 
     deps = [
-      ":view_manager_lib",
+      ":lib",
       "//base",
       "//components/view_manager/public/interfaces",
       "//components/view_manager/native_viewport",
       "//mojo/application/public/cpp",
       "//mojo/converters/geometry",
       "//mojo/environment:chromium",
       "//third_party/mojo/src/mojo/public/cpp/bindings:bindings",
       "//ui/events",
       "//ui/events/platform",
       "//ui/gl",
     ]
   }
 }
 
-source_set("view_manager_lib") {
+source_set("lib") {
   sources = [
     "access_policy.h",
     "access_policy_delegate.h",
     "animation_runner.cc",
     "animation_runner.h",
     "animation_runner_observer.h",
     "client_connection.cc",
     "client_connection.h",
     "connection_manager.cc",
     "connection_manager.h",
@@ skipping 32 matching lines @@
   ]
 
   public_deps = [
     "//components/view_manager/public/cpp",
   ]
 
   deps = [
     "//base",
     "//cc/surfaces",
     "//cc/surfaces:surface_id",
-    "//components/surfaces/public/interfaces",
     "//components/view_manager/public/cpp:common",
     "//components/view_manager/public/interfaces",
     "//components/view_manager/native_viewport",
     "//mojo/application/public/cpp",
     "//mojo/common:tracing_impl",
     "//mojo/converters/geometry",
     "//mojo/converters/input_events",
     "//mojo/converters/surfaces",
     "//third_party/mojo/src/mojo/public/cpp/bindings:callback",
     "//ui/mojo/geometry:interfaces",
     "//ui/mojo/events:interfaces",
     "//ui/gfx",
     "//ui/gfx/geometry",
   ]
-
-  data_deps = [ "//components/surfaces" ]
 }
 
 source_set("test_support") {
   testonly = true
 
   sources = [
     "test_change_tracker.cc",
     "test_change_tracker.h",
   ]
 
@@ skipping 25 matching lines @@
     "scheduled_animation_group_unittest.cc",
     "server_view_drawn_tracker_unittest.cc",
     "test_server_view_delegate.cc",
     "test_server_view_delegate.h",
     "view_coordinate_conversions_unittest.cc",
     "view_manager_service_unittest.cc",
   ]
 
   deps = [
     ":test_support",
-    ":view_manager_lib",
+    ":lib",
     "//base",
     "//base/test:test_config",
     "//components/view_manager/public/cpp:common",
     "//components/view_manager/public/interfaces",
     "//mojo/application/public/interfaces",
     "//mojo/converters/geometry",
     "//mojo/converters/input_events",
     "//mojo/environment:chromium",
     "//third_party/mojo/src/mojo/edk/test:run_all_unittests",
     "//third_party/mojo/src/mojo/public/cpp/bindings:bindings",
@@ skipping 25 matching lines @@
     "//base/test:test_config",
     "//components/view_manager/public/cpp",
     "//components/view_manager/public/interfaces",
     "//mojo/application/public/cpp:test_support",
     "//ui/mojo/geometry:interfaces",
     "//ui/mojo/geometry:util",
   ]
 
   data_deps = [ ":view_manager" ]
 }