summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-16 18:49:41 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-16 18:49:41 +0000
commitdadf8c49e3a2deb3c79c3e95e1702cab95eeaab7 (patch)
treef263c4bd212f52ac02a4207093abc74afea25b80 /build
parent83146ab03ac84854485a5ba57159882fca685127 (diff)
downloadchromium_src-dadf8c49e3a2deb3c79c3e95e1702cab95eeaab7.zip
chromium_src-dadf8c49e3a2deb3c79c3e95e1702cab95eeaab7.tar.gz
chromium_src-dadf8c49e3a2deb3c79c3e95e1702cab95eeaab7.tar.bz2
Revert of Convert the re2 GYP targets to be generated by GN. (https://codereview.chromium.org/68853015/)
Reason for revert: Broke Blink compile Original issue's description: > Convert the re2 GYP targets to be generated by GN. > > BUG=288991 > R=bradnelson@google.com > > Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=245254 TBR=bradnelson@chromium.org,bradnelson@google.com NOTREECHECKS=true NOTRY=true BUG=288991 Review URL: https://codereview.chromium.org/141063002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@245271 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 84fb690..721d04f 100644
--- a/build/all.gyp
+++ b/build/all.gyp
@@ -47,7 +47,6 @@
'../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:*',
@@ -66,6 +65,7 @@
'../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:*',