Fix GN linking issues.

This gets rid of most of the non-webrtc/jingle linker errors for webkit_tests.

R=jamesr@chromium.org

Review URL: https://codereview.chromium.org/419613002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@285375 0039d316-1c4b-4281-b951-d872f2087c98

11 files changed, 69 insertions, 38 deletions

diff --git a/content/app/BUILD.gn b/content/app/BUILD.gn
index c8f1370..236ccc8 100644
--- a/content/app/BUILD.gn
+++ b/content/app/BUILD.gn
@@ -28,6 +28,7 @@ source_set("app") {
     # picking the allocator.
     "//base/allocator",
     "//content:export",
+    "//content/public/common",
     "//crypto",
     "//ui/base",
     "//ui/gfx",
diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn
index 8652983..d08e80d 100644
--- a/content/browser/BUILD.gn
+++ b/content/browser/BUILD.gn
@@ -306,7 +306,7 @@ source_set("browser") {
     ]
     deps += [
       #"//content:jni_headers",  TODO(GYP)
-      #"//media",  TODO(GYP)
+      "//media",
     ]
     libs += [ "jnigraphics" ]
   }
diff --git a/content/browser/devtools/BUILD.gn b/content/browser/devtools/BUILD.gn
index c24b60e..1480454 100644
--- a/content/browser/devtools/BUILD.gn
+++ b/content/browser/devtools/BUILD.gn
@@ -34,8 +34,8 @@ grit("devtools_resources") {
   ]
 }
 
-action("devtools_protocol_constants") {
-  visibility = ":resources"
+action("gen_devtools_protocol_constants") {
+  visibility = ":devtools_protocol_constants"
 
   script = "//content/public/browser/devtools_protocol_constants_generator.py"
 
@@ -53,3 +53,8 @@ action("devtools_protocol_constants") {
     rebase_path(browser_protocol, root_build_dir),
   ]
 }
+
+source_set("devtools_protocol_constants") {
+  visibility = ":resources"
+  sources = get_target_outputs(":gen_devtools_protocol_constants")
+}
diff --git a/content/common/BUILD.gn b/content/common/BUILD.gn
index af0334b..fa71c12 100644
--- a/content/common/BUILD.gn
+++ b/content/common/BUILD.gn
@@ -36,6 +36,7 @@ source_set("common") {
     "//ui/base",
     "//ui/gfx",
     "//ui/gfx/geometry",
+    "//ui/gfx/ipc",
     "//ui/shell_dialogs",
     "//url",
     "//third_party/WebKit/public:blink_headers",
@@ -56,17 +57,16 @@ source_set("common") {
       "//gpu/command_buffer/client:gles2_implementation",
       "//gpu/command_buffer/service",
       "//gpu/ipc",
+      "//gpu/skia_bindings",
+      "//media",
+      "//media:shared_memory_support",
       "//mojo/public/interfaces/service_provider",
+      "//third_party/WebKit/public:blink",
       "//ui/gl",
       "//webkit/browser:storage",
       "//webkit/common",
       "//webkit/common:storage",
       "//webkit/common/gpu",
-      #'../gpu/gpu.gyp:gl_in_process_context',
-      #'../gpu/skia_bindings/skia_bindings.gyp:gpu_skia_bindings',
-      #'../media/media.gyp:media',
-      #'../media/media.gyp:shared_memory_support',
-      #'../third_party/WebKit/public/blink.gyp:blink',
     ]
   }
 
@@ -150,6 +150,10 @@ source_set("common") {
   }
 
   if (use_x11) {
+    sources += [
+      "gpu/gpu_memory_buffer_factory_x11_pixmap.cc",
+      "common/gpu/gpu_memory_buffer_factory_x11_pixmap.h",
+    ]
     include_dirs += [ "//third_party/khronos" ]
     configs += [ "//build/config/linux:xcomposite" ]
 
@@ -178,10 +182,6 @@ source_set("common") {
       "gpu/media/android_video_decode_accelerator.cc",
       "gpu/media/android_video_decode_accelerator.h",
     ]
-    deps += [
-      # TODO(GYP) enable once supported in the GN build.
-      #"//media",
-    ]
 
     if (enable_webrtc) {
       deps += [ "//third_party/libyuv" ]
@@ -204,8 +204,6 @@ source_set("common") {
         "gpu/media/v4l2_video_encode_accelerator.cc",
         "gpu/media/v4l2_video_encode_accelerator.h",
       ]
-      # TODO(GYP) enable once supported in the GN build.
-      #deps += [ "//media" ]
       libs = [ "EGL", "GLESv2" ]
     } else {  # !arm
       sources += [
@@ -230,8 +228,6 @@ source_set("common") {
     ]
     include_dirs += [ "//third_party/khronos" ]
     deps += [
-      # TODO(GYP) enable once supported in the GN build.
-      #"//media",
       "//ui/gl",
     ]
 
diff --git a/content/renderer/BUILD.gn b/content/renderer/BUILD.gn
index 1b83c38..a357442 100644
--- a/content/renderer/BUILD.gn
+++ b/content/renderer/BUILD.gn
@@ -27,6 +27,8 @@ source_set("renderer") {
     "//content:resources",
     "//content/common:mojo_bindings",
     "//gin",
+    "//media",
+    "//mojo/bindings/js",
     "//mojo/environment:chromium",
     "//mojo/public/js/bindings",
     "//mojo/public/interfaces/service_provider",
@@ -34,7 +36,7 @@ source_set("renderer") {
     "//skia",
     "//third_party/icu",
     "//third_party/npapi",
-    "//third_party/WebKit/public:blink_headers",
+    "//third_party/WebKit/public:blink",
     "//third_party/widevine/cdm:version_h",
     "//ui/accessibility",
     "//ui/events:dom4_keycode_converter",
@@ -45,11 +47,8 @@ source_set("renderer") {
     "//webkit/common",
     "//webkit/common:storage",
     "//webkit/common/gpu",
-    # TODO(GYP)
-    #'../jingle/jingle.gyp:jingle_glue',
-    #'../media/media.gyp:media',
-    #'../third_party/WebKit/public/blink.gyp:blink',
-    #'../third_party/libjingle/libjingle.gyp:libjingle',
+    #'../jingle/jingle.gyp:jingle_glue',  TODO(GYP)
+    #'../third_party/libjingle/libjingle.gyp:libjingle',  TODO(GYP)
   ]
 
   if (!enable_notifications) {
@@ -89,8 +88,7 @@ source_set("renderer") {
 
     deps += [
       "//third_party/android_tools:cpu_features",
-      # TODO(GYP)
-      #"//third_party/libphonenumber",
+      "//third_party/libphonenumber",
     ]
   } else {
     sources -= [
@@ -130,12 +128,11 @@ source_set("renderer") {
         ".", "//content")
     deps += [
       "//crypto",
-      # TODO(GYP)
-      #"../third_party/libjingle/libjingle.gyp:libjingle_webrtc",
-      #"../third_party/libjingle/libjingle.gyp:libpeerconnection",
-      #"../third_party/webrtc/modules/modules.gyp:audio_device",
-      #"../third_party/webrtc/modules/modules.gyp:audio_processing",
-      #"//third_party/libyuv",
+      "//third_party/libyuv",
+      #"../third_party/libjingle/libjingle.gyp:libjingle_webrtc",  TODO(GYP)
+      #"../third_party/libjingle/libjingle.gyp:libpeerconnection",  TODO(GYP)
+      #"../third_party/webrtc/modules/modules.gyp:audio_device",  TODO(GYP)
+      #"../third_party/webrtc/modules/modules.gyp:audio_processing",  TODO(GYP)
     ]
   } else {
     sources += [
diff --git a/content/test/BUILD.gn b/content/test/BUILD.gn
index 9578b40..420d9ea 100644
--- a/content/test/BUILD.gn
+++ b/content/test/BUILD.gn
@@ -15,6 +15,9 @@ content_tests_gypi_values = exec_script(
 # GYP version //content/content_tests.gypi:test_support_content
 static_library("test_support") {
   deps = [
+    "//content/public/app",
+    "//content/public/browser",
+    "//content/public/common",
     "//net:test_support",
     "//skia",
     "//testing/gmock",
@@ -30,23 +33,19 @@ static_library("test_support") {
     "//ui/resources",
     "//url",
     "//webkit/common",
-    "//content/browser/speech/proto",
-    "//content/browser",
-    "//content/common",
-    "//content/app",
   ]
 
   if (!is_ios) {
-    sources = rebase_path(content_tests_gypi_values.layouttest_support_content_sources,
+    sources = rebase_path(content_tests_gypi_values.test_support_content_sources,
                           ".", "//content")
 
     deps += [
+      "//content/browser/speech/proto",
       "//content/child",
-      "//content/common",
       "//content/gpu",
       "//content/ppapi_plugin",
-      "//content/renderer",
-      "//content/utility",
+      "//content/public/renderer",
+      "//content/public/utility",
       "//content/worker",
       "//cc",
       "//cc:test_support",
diff --git a/gpu/BUILD.gn b/gpu/BUILD.gn
index 9027948..916eda5 100644
--- a/gpu/BUILD.gn
+++ b/gpu/BUILD.gn
@@ -33,6 +33,8 @@
 #     //gpu/command_buffer/common
 #     (Merged in to here because the separate file exists in GYP only to break
 #     a .gyp file dependency cycle which GN doesn't have.)
+#
+# gpu/skia_bindings/skia_bindings.gyp:gpu_skia_bindings => //gpu/skia_bindings
 
 component("gpu") {
   deps = [
diff --git a/gpu/skia_bindings/skia_bindings.gyp b/gpu/skia_bindings/skia_bindings.gyp
index ddc750e..3e844c4 100644
--- a/gpu/skia_bindings/skia_bindings.gyp
+++ b/gpu/skia_bindings/skia_bindings.gyp
@@ -8,6 +8,7 @@
   },
   'targets': [
     {
+      # GN version: //gpu/skia_bindings
       'target_name': 'gpu_skia_bindings',
       'type': 'static_library',
       'dependencies': [
diff --git a/mojo/bindings/js/BUILD.gn b/mojo/bindings/js/BUILD.gn
new file mode 100644
index 0000000..f89e430
--- /dev/null
+++ b/mojo/bindings/js/BUILD.gn
@@ -0,0 +1,26 @@
+# 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.
+
+# GYP version: mojo/mojo.gyp:mojo_js_bindings
+static_library("js") {
+  sources = [
+    "core.cc",
+    "core.h",
+    "handle.cc",
+    "handle.h",
+    "support.cc",
+    "support.h",
+    "waiting_callback.cc",
+    "waiting_callback.h",
+  ]
+
+  deps = [
+    "//base",
+    "//gin",
+    "//mojo/common",
+    "//v8",
+  ]
+
+  forward_dependent_configs_from = deps
+}
diff --git a/mojo/mojo.gyp b/mojo/mojo.gyp
index 994893e..1c6a719 100644
--- a/mojo/mojo.gyp
+++ b/mojo/mojo.gyp
@@ -723,6 +723,7 @@
       ],
     },
     {
+      # GN version: //mojo/bindings/js
       'target_name': 'mojo_js_bindings_lib',
       'type': 'static_library',
       'dependencies': [
@@ -737,6 +738,7 @@
         'mojo_common_lib',
       ],
       'sources': [
+        # Sources list duplicated in GN build.
         'bindings/js/core.cc',
         'bindings/js/core.h',
         'bindings/js/handle.cc',
diff --git a/mojo/system/BUILD.gn b/mojo/system/BUILD.gn
index 2ad4679..5ce0cd3 100644
--- a/mojo/system/BUILD.gn
+++ b/mojo/system/BUILD.gn
@@ -14,6 +14,8 @@ component("system") {
 
   sources = [
     # Should there be a separate "embedder" target?
+    "../embedder/channel_init.cc",
+    "../embedder/channel_init.h",
     "../embedder/embedder.cc",
     "../embedder/embedder.h",
     "../embedder/platform_channel_pair.cc",