diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-16 18:49:41 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-16 18:49:41 +0000 |
| commit | dadf8c49e3a2deb3c79c3e95e1702cab95eeaab7 (patch) | |
| tree | f263c4bd212f52ac02a4207093abc74afea25b80 /components | |
| parent | 83146ab03ac84854485a5ba57159882fca685127 (diff) | |
| download | chromium_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 'components')
| -rw-r--r-- | components/plugins.gypi | 2 | ||||
| -rw-r--r-- | components/url_matcher.gypi | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/components/plugins.gypi b/components/plugins.gypi index 8679f06..e7b00ec 100644 --- a/components/plugins.gypi +++ b/components/plugins.gypi @@ -13,7 +13,7 @@ 'dependencies': [ '../gin/gin.gyp:gin', '../skia/skia.gyp:skia', - '../out/gn_gyp/third_party/re2/re2.gyp:re2', + '../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 da057de..3476552 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', - '../out/gn_gyp/third_party/re2/re2.gyp:re2', + '../third_party/re2/re2.gyp:re2', '../url/url.gyp:url_lib', ], 'include_dirs': [ |