summaryrefslogtreecommitdiffstats
path: root/webkit/common
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-06-23 22:28:15 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-06-23 22:28:15 +0000
commit3b816b916c6ff7870f1b4ec4653fd3eed38916b6 (patch)
tree9d8494da13d146f14f9cdf2dca78048fa37d9cfd /webkit/common
parent3cd95a21a58aba94ae58f9f70701be2f65e69b4a (diff)
downloadchromium_src-3b816b916c6ff7870f1b4ec4653fd3eed38916b6.zip
chromium_src-3b816b916c6ff7870f1b4ec4653fd3eed38916b6.tar.gz
chromium_src-3b816b916c6ff7870f1b4ec4653fd3eed38916b6.tar.bz2
Add chrome/plugin and chrome/utility to GN build.
Updates some TODO references to blink now that there's a proper blink target. R=jamesr@chromium.org Review URL: https://codereview.chromium.org/348363002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@279202 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/common')
-rw-r--r--webkit/common/gpu/BUILD.gn3
-rw-r--r--webkit/common/gpu/webkit_gpu.gyp1
2 files changed, 3 insertions, 1 deletions
diff --git a/webkit/common/gpu/BUILD.gn b/webkit/common/gpu/BUILD.gn
index 862d4b5..cecbd9d 100644
--- a/webkit/common/gpu/BUILD.gn
+++ b/webkit/common/gpu/BUILD.gn
@@ -2,6 +2,7 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
+# GYP version: webkit/common/gpu/webkit_gpu.gyp:webkit_gpu
component("gpu") {
output_name = "webkit_gpu"
@@ -35,7 +36,7 @@ component("gpu") {
"//gpu/command_buffer/client:gl_in_process_context",
"//gpu/skia_bindings",
"//skia",
- #"//third_party/WebKit/public:blink_minimal", TODO(GYP)
+ "//third_party/WebKit/public:blink_minimal",
"//third_party/angle:translator",
"//ui/gl",
"//ui/gfx",
diff --git a/webkit/common/gpu/webkit_gpu.gyp b/webkit/common/gpu/webkit_gpu.gyp
index 23b36e5..7388e18 100644
--- a/webkit/common/gpu/webkit_gpu.gyp
+++ b/webkit/common/gpu/webkit_gpu.gyp
@@ -10,6 +10,7 @@
['OS != "ios"', {
'targets': [
{
+ # GN version: //webkit/common/gpu
'target_name': 'webkit_gpu',
'type': '<(component)',
'variables': { 'enable_wexit_time_destructors': 1, },