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 /ui | |
| 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 'ui')
| -rw-r--r-- | ui/message_center/message_center.gyp | 2 | ||||
| -rw-r--r-- | ui/oak/oak.gyp | 2 | ||||
| -rw-r--r-- | ui/ui.gyp | 2 | ||||
| -rw-r--r-- | ui/ui_unittests.gypi | 2 | ||||
| -rw-r--r-- | ui/views/controls/webview/webview.gyp | 2 | ||||
| -rw-r--r-- | ui/views/views.gyp | 6 |
6 files changed, 8 insertions, 8 deletions
diff --git a/ui/message_center/message_center.gyp b/ui/message_center/message_center.gyp index b9dc7b9..a15136e 100644 --- a/ui/message_center/message_center.gyp +++ b/ui/message_center/message_center.gyp @@ -14,8 +14,8 @@ '../../base/base.gyp:base', '../../base/base.gyp:base_i18n', '../../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', + '../../build/temp_gyp/googleurl.gyp:googleurl', '../../skia/skia.gyp:skia', - '../../url/url.gyp:url', '../base/strings/ui_strings.gyp:ui_strings', '../compositor/compositor.gyp:compositor', '../ui.gyp:ui', diff --git a/ui/oak/oak.gyp b/ui/oak/oak.gyp index 10df891..216d198 100644 --- a/ui/oak/oak.gyp +++ b/ui/oak/oak.gyp @@ -14,8 +14,8 @@ 'dependencies': [ '../../base/base.gyp:base', '../../base/base.gyp:base_i18n', + '../../build/temp_gyp/googleurl.gyp:googleurl', '../../skia/skia.gyp:skia', - '../../url/url.gyp:url', '../aura/aura.gyp:aura', '../compositor/compositor.gyp:compositor', '../ui.gyp:ui', @@ -19,13 +19,13 @@ '../base/base.gyp:base_i18n', '../base/base.gyp:base_static', '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', + '../build/temp_gyp/googleurl.gyp:googleurl', '../net/net.gyp:net', '../skia/skia.gyp:skia', '../third_party/icu/icu.gyp:icui18n', '../third_party/icu/icu.gyp:icuuc', '../third_party/libpng/libpng.gyp:libpng', '../third_party/zlib/zlib.gyp:zlib', - '../url/url.gyp:url', 'base/strings/ui_strings.gyp:ui_strings', 'ui_resources', ], diff --git a/ui/ui_unittests.gypi b/ui/ui_unittests.gypi index b09c359..114ad63 100644 --- a/ui/ui_unittests.gypi +++ b/ui/ui_unittests.gypi @@ -58,13 +58,13 @@ 'dependencies': [ '../base/base.gyp:base', '../base/base.gyp:test_support_base', + '../build/temp_gyp/googleurl.gyp:googleurl', '../skia/skia.gyp:skia', '../testing/gmock.gyp:gmock', '../testing/gtest.gyp:gtest', '../third_party/icu/icu.gyp:icui18n', '../third_party/icu/icu.gyp:icuuc', '../third_party/libpng/libpng.gyp:libpng', - '../url/url.gyp:url', 'run_ui_unittests', 'shell_dialogs', 'ui', diff --git a/ui/views/controls/webview/webview.gyp b/ui/views/controls/webview/webview.gyp index 68bd84d..cfa717d 100644 --- a/ui/views/controls/webview/webview.gyp +++ b/ui/views/controls/webview/webview.gyp @@ -14,9 +14,9 @@ '../../../../base/base.gyp:base', '../../../../base/base.gyp:base_i18n', '../../../../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', + '../../../../build/temp_gyp/googleurl.gyp:googleurl', '../../../../content/content.gyp:content', '../../../../skia/skia.gyp:skia', - '../../../../url/url.gyp:url', '../../../ui.gyp:ui', '../../../web_dialogs/web_dialogs.gyp:web_dialogs', '../../views.gyp:views', diff --git a/ui/views/views.gyp b/ui/views/views.gyp index 3af10e1..315b382 100644 --- a/ui/views/views.gyp +++ b/ui/views/views.gyp @@ -24,10 +24,10 @@ '../../base/base.gyp:base', '../../base/base.gyp:base_i18n', '../../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', + '../../build/temp_gyp/googleurl.gyp:googleurl', '../../skia/skia.gyp:skia', '../../third_party/icu/icu.gyp:icui18n', '../../third_party/icu/icu.gyp:icuuc', - '../../url/url.gyp:url', '../base/strings/ui_strings.gyp:ui_strings', '../compositor/compositor.gyp:compositor', '../native_theme/native_theme.gyp:native_theme', @@ -648,12 +648,12 @@ # factored out. (for some reason it pulls in a bunch # unrelated things like v8, sqlite nss...). '../../chrome/chrome_resources.gyp:packed_resources', + '../../build/temp_gyp/googleurl.gyp:googleurl', '../../skia/skia.gyp:skia', '../../testing/gmock.gyp:gmock', '../../testing/gtest.gyp:gtest', '../../third_party/icu/icu.gyp:icui18n', '../../third_party/icu/icu.gyp:icuuc', - '../../url/url.gyp:url', '../base/strings/ui_strings.gyp:ui_strings', '../compositor/compositor.gyp:compositor', '../compositor/compositor.gyp:compositor_test_support', @@ -862,12 +862,12 @@ 'dependencies': [ '../../base/base.gyp:base', '../../base/base.gyp:base_i18n', + '../../build/temp_gyp/googleurl.gyp:googleurl', '../../chrome/chrome_resources.gyp:packed_resources', '../../content/content.gyp:content', '../../skia/skia.gyp:skia', '../../third_party/icu/icu.gyp:icui18n', '../../third_party/icu/icu.gyp:icuuc', - '../../url/url.gyp:url', '../ui.gyp:ui', '../ui.gyp:ui_resources', 'controls/webview/webview.gyp:webview', |