summaryrefslogtreecommitdiffstats
path: root/components
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-17 18:26:43 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-17 18:26:43 +0000
commitc8868c8b778fb3700e2c05c4868492a6c30ff70d (patch)
tree272a87bebec57191e9c5f3a8679df12759268aab /components
parent55ad8c14c31df30801d8422e81b78322f95c0526 (diff)
downloadchromium_src-c8868c8b778fb3700e2c05c4868492a6c30ff70d.zip
chromium_src-c8868c8b778fb3700e2c05c4868492a6c30ff70d.tar.gz
chromium_src-c8868c8b778fb3700e2c05c4868492a6c30ff70d.tar.bz2
Convert the re2 GYP targets to be generated by GN.
BUG=288991 R=bradnelson@google.com Reland of r245254 Review URL: https://codereview.chromium.org/141053003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@245563 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'components')
-rw-r--r--components/plugins.gypi2
-rw-r--r--components/url_matcher.gypi2
2 files changed, 2 insertions, 2 deletions
diff --git a/components/plugins.gypi b/components/plugins.gypi
index e7b00ec..8679f06 100644
--- a/components/plugins.gypi
+++ b/components/plugins.gypi
@@ -13,7 +13,7 @@
'dependencies': [
'../gin/gin.gyp:gin',
'../skia/skia.gyp:skia',
- '../third_party/re2/re2.gyp:re2',
+ '../out/gn_gyp/third_party/re2/re2.gyp:re2',
'../third_party/WebKit/public/blink.gyp:blink',
'../v8/tools/gyp/v8.gyp:v8',
],
diff --git a/components/url_matcher.gypi b/components/url_matcher.gypi
index 3476552..da057de 100644
--- a/components/url_matcher.gypi
+++ b/components/url_matcher.gypi
@@ -10,7 +10,7 @@
'dependencies': [
'../base/base.gyp:base',
'../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
- '../third_party/re2/re2.gyp:re2',
+ '../out/gn_gyp/third_party/re2/re2.gyp:re2',
'../url/url.gyp:url_lib',
],
'include_dirs': [