Move android_image_reader_utils* into a new source set.

Move android_image_reader_utils to a new source set. This helps to
reduce unwanted dependencies in the places which needs to use
android_image_reader_utils* files.

Bug: 891060
Change-Id: I2557ca40d5ab011de800d842cf2ab18dcb238381
Reviewed-on: https://chromium-review.googlesource.com/c/1388389
Commit-Queue: vikas soni <[email protected]>
Reviewed-by: Will Harris <[email protected]>
Reviewed-by: Dan Sanders <[email protected]>
Cr-Commit-Position: refs/heads/master@{#618631}

gpu/ipc/common/BUILD.gn

@@ -139,8 +139,6 @@ source_set("ipc_common_sources") {
 
   if (is_android) {
     sources += [
-      "android/android_image_reader_utils.cc",
-      "android/android_image_reader_utils.h",
       "android/scoped_surface_request_conduit.cc",
       "android/scoped_surface_request_conduit.h",
       "android/surface_owner_android.cc",
@@ -151,13 +149,31 @@ source_set("ipc_common_sources") {
       "gpu_surface_tracker.h",
     ]
     libs = [ "android" ]
+    deps += [ ":android_image_reader_utils" ]
   }
 
   if (use_ozone) {
     deps += [ "//ui/ozone" ]
   }
 }
 
+if (is_android) {
+  source_set("android_image_reader_utils") {
+    sources = [
+      "android/android_image_reader_utils.cc",
+      "android/android_image_reader_utils.h",
+    ]
+    deps = [
+      "//base",
+      "//ui/gl",
+    ]
+    visibility = [
+      "//gpu/*",
+      "//media/gpu:gpu",
+    ]
+  }
+}
+
 # Depend on this to use surface_handle.h without pulling in all of gpu ipc.
 source_set("surface_handle_type") {
   public = [

media/gpu/BUILD.gn

@@ -178,6 +178,8 @@ component("gpu") {
     ]
     libs += [ "android" ]
     deps += [
+      "//gpu/ipc/common:android_image_reader_utils",
+
       # TODO(crbug.com/789435): This can be removed once CdmManager is removed.
       "//gpu/ipc/common:ipc_common_sources",
       "//media/mojo:buildflags",