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

components/view_manager/BUILD.gn

Index: components/view_manager/BUILD.gn
diff --git a/components/view_manager/BUILD.gn b/components/view_manager/BUILD.gn
index db7fce6bdc0b9e3d5ecae68a3801bd1e341b2b30..1c3cf0c6b58698d68d317817f7794cae05cc439c 100644
--- a/components/view_manager/BUILD.gn
+++ b/components/view_manager/BUILD.gn
@@ -13,8 +13,8 @@ if (is_android) {
   group("view_manager") {
     deps = [
       ":jni_headers",
+      ":lib",
       ":loader",
-      ":view_manager_lib",
       ":view_manager_java",
       "native_viewport",
     ]
@@ -54,7 +54,7 @@ if (is_android) {
     ]
 
     deps = [
-      ":view_manager_lib",
+      ":lib",
       "//base",
       "//components/view_manager/public/interfaces",
       "//components/view_manager/native_viewport",
@@ -69,7 +69,7 @@ if (is_android) {
   }
 }
 
-source_set("view_manager_lib") {
+source_set("lib") {
   sources = [
     "access_policy.h",
     "access_policy_delegate.h",
@@ -122,7 +122,6 @@ source_set("view_manager_lib") {
     "//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",
@@ -137,8 +136,6 @@ source_set("view_manager_lib") {
     "//ui/gfx",
     "//ui/gfx/geometry",
   ]
-
-  data_deps = [ "//components/surfaces" ]
 }
 
 source_set("test_support") {
@@ -184,7 +181,7 @@ test("view_manager_unittests") {
 
   deps = [
     ":test_support",
-    ":view_manager_lib",
+    ":lib",
     "//base",
     "//base/test:test_config",
     "//components/view_manager/public/cpp:common",