diff options
| author | michaeln@google.com <michaeln@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-12 19:23:04 +0000 |
|---|---|---|
| committer | michaeln@google.com <michaeln@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-12 19:23:04 +0000 |
| commit | 173509e01940012228b386bf50c26d42e1586022 (patch) | |
| tree | 523d90bc858cffd19441f4f2259e49f512c681e2 /chrome/chrome_browser.gypi | |
| parent | e217c563ed3adcee9d4fd6135b260e8084c12401 (diff) | |
| download | chromium_src-173509e01940012228b386bf50c26d42e1586022.zip chromium_src-173509e01940012228b386bf50c26d42e1586022.tar.gz chromium_src-173509e01940012228b386bf50c26d42e1586022.tar.bz2 | |
Revert 193968 "Roll the DEPS for google-url."
> Roll the DEPS for google-url.
>
> And update all the references from build/temp_gyp/googleurl.gyp to url/url.gyp.
>
> This also changes googleurl.gyp to reference the files under url/, so that we
> don't break the Blink tree.
>
> BUG=229660
> R=brettw@chromium.org
> TBR=brettw@chromium.org
>
> Review URL: https://chromiumcodereview.appspot.com/14089011
TBR=tfarina@chromium.org
Review URL: https://codereview.chromium.org/14028012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@193983 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_browser.gypi')
| -rw-r--r-- | chrome/chrome_browser.gypi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi index 61f08cd..ff515d6 100644 --- a/chrome/chrome_browser.gypi +++ b/chrome/chrome_browser.gypi @@ -26,6 +26,7 @@ 'safe_browsing_proto', 'safe_browsing_report_proto', 'variations_seed_proto', + '../build/temp_gyp/googleurl.gyp:googleurl', '../components/components.gyp:encryptor', '../components/components.gyp:user_prefs', '../components/components.gyp:visitedlink_browser', @@ -54,7 +55,6 @@ '../ui/ui.gyp:shell_dialogs', '../ui/ui.gyp:ui', '../ui/ui.gyp:ui_resources', - '../url/url.gyp:url', '../webkit/support/webkit_support.gyp:user_agent', ], 'include_dirs': [ |