summaryrefslogtreecommitdiffstats
path: root/build
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 /build
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 'build')
-rw-r--r--build/all.gyp2
1 files changed, 1 insertions, 1 deletions
diff --git a/build/all.gyp b/build/all.gyp
index dc6607f..7e0f104 100644
--- a/build/all.gyp
+++ b/build/all.gyp
@@ -47,6 +47,7 @@
'../media/cast/cast.gyp:*',
'../media/media.gyp:*',
'../mojo/mojo.gyp:*',
+ '../out/gn_gyp/third_party/re2/re2.gyp:re2',
'../ppapi/ppapi.gyp:*',
'../ppapi/ppapi_internal.gyp:*',
'../printing/printing.gyp:*',
@@ -65,7 +66,6 @@
'../third_party/npapi/npapi.gyp:*',
'../third_party/ots/ots.gyp:*',
'../third_party/qcms/qcms.gyp:*',
- '../third_party/re2/re2.gyp:re2',
'../third_party/WebKit/public/all.gyp:*',
'../tools/gn/gn.gyp:*',
'../tools/perf/clear_system_cache/clear_system_cache.gyp:*',