summaryrefslogtreecommitdiffstats
path: root/gpu
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-16 18:15:08 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-16 18:15:08 +0000
commit9dca84a2df64acb82d896ddd3c93b2903198f1c0 (patch)
tree8449780f2e722db70637ab3192a64c46d1ee51ad /gpu
parent00b2947e4e7fbda1f6afa76a8a52aadcebc6a4ed (diff)
downloadchromium_src-9dca84a2df64acb82d896ddd3c93b2903198f1c0.zip
chromium_src-9dca84a2df64acb82d896ddd3c93b2903198f1c0.tar.gz
chromium_src-9dca84a2df64acb82d896ddd3c93b2903198f1c0.tar.bz2
Convert the re2 GYP targets to be generated by GN.
BUG=288991 R=bradnelson@google.com Review URL: https://codereview.chromium.org/68853015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@245254 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu')
-rw-r--r--gpu/command_buffer_service.gypi2
-rw-r--r--gpu/gpu_config.gypi2
2 files changed, 2 insertions, 2 deletions
diff --git a/gpu/command_buffer_service.gypi b/gpu/command_buffer_service.gypi
index a216090..60f8fb0 100644
--- a/gpu/command_buffer_service.gypi
+++ b/gpu/command_buffer_service.gypi
@@ -23,7 +23,7 @@
'../third_party/khronos/khronos.gyp:khronos_headers',
'../third_party/protobuf/protobuf.gyp:protobuf_lite',
'../third_party/smhasher/smhasher.gyp:cityhash',
- '../third_party/re2/re2.gyp:re2',
+ '../out/gn_gyp/third_party/re2/re2.gyp:re2',
],
'sources': [
'command_buffer/service/async_pixel_transfer_delegate.cc',
diff --git a/gpu/gpu_config.gypi b/gpu/gpu_config.gypi
index 9c1d581..8d35a96 100644
--- a/gpu/gpu_config.gypi
+++ b/gpu/gpu_config.gypi
@@ -5,7 +5,7 @@
{
'dependencies': [
'../base/base.gyp:base',
- '../third_party/re2/re2.gyp:re2',
+ '../out/gn_gyp/third_party/re2/re2.gyp:re2',
'../ui/gl/gl.gyp:gl',
],
'include_dirs': [