diff options
| author | michaeln@google.com <michaeln@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-12 20:13:18 +0000 |
|---|---|---|
| committer | michaeln@google.com <michaeln@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-12 20:13:18 +0000 |
| commit | 0b31351ef3f852293a41fe71d0c8bcf3d21a9105 (patch) | |
| tree | a94d34b1320937d1c5bd2ebabaedd4af762c85ac /ash | |
| parent | 061561df557e6c0e14e4207b3700e398f554351d (diff) | |
| download | chromium_src-0b31351ef3f852293a41fe71d0c8bcf3d21a9105.zip chromium_src-0b31351ef3f852293a41fe71d0c8bcf3d21a9105.tar.gz chromium_src-0b31351ef3f852293a41fe71d0c8bcf3d21a9105.tar.bz2 | |
Lets try this again.
Revert 193983 "Revert 193968 "Roll the DEPS for google-url.""
> 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
TBR=michaeln@google.com
Review URL: https://codereview.chromium.org/14109014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@193992 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash')
| -rw-r--r-- | ash/ash.gyp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ash/ash.gyp b/ash/ash.gyp index 192a27b..8105854 100644 --- a/ash/ash.gyp +++ b/ash/ash.gyp @@ -19,7 +19,6 @@ '../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', '../content/content.gyp:content_browser', '../ipc/ipc.gyp:ipc', @@ -31,14 +30,15 @@ '../ui/aura/aura.gyp:aura', '../ui/base/strings/ui_strings.gyp:ui_strings', '../ui/compositor/compositor.gyp:compositor', + '../ui/keyboard/keyboard.gyp:keyboard', '../ui/message_center/message_center.gyp:message_center', '../ui/oak/oak.gyp:oak', '../ui/ui.gyp:ui', '../ui/ui.gyp:ui_resources', '../ui/views/controls/webview/webview.gyp:webview', '../ui/views/views.gyp:views', - '../ui/keyboard/keyboard.gyp:keyboard', '../ui/web_dialogs/web_dialogs.gyp:web_dialogs', + '../url/url.gyp:url', 'ash_resources', 'ash_wallpaper_resources', ], @@ -582,14 +582,13 @@ '../chrome/chrome_resources.gyp:packed_resources', '../content/content.gyp:content_browser', '../content/content.gyp:test_support_content', - '../build/temp_gyp/googleurl.gyp:googleurl', '../skia/skia.gyp:skia', '../testing/gtest.gyp:gtest', '../third_party/icu/icu.gyp:icui18n', '../third_party/icu/icu.gyp:icuuc', + '../ui/app_list/app_list.gyp:app_list', '../ui/aura/aura.gyp:aura', '../ui/aura/aura.gyp:aura_test_support', - '../ui/app_list/app_list.gyp:app_list', '../ui/compositor/compositor.gyp:compositor', '../ui/compositor/compositor.gyp:compositor_test_support', '../ui/message_center/message_center.gyp:message_center', @@ -597,10 +596,11 @@ '../ui/ui.gyp:ui_resources', '../ui/ui.gyp:ui_test_support', '../ui/views/views.gyp:views', - '../ui/views/views.gyp:views_test_support', '../ui/views/views.gyp:views_examples_with_content_lib', + '../ui/views/views.gyp:views_test_support', '../ui/views/views.gyp:views_with_content_test_support', '../ui/web_dialogs/web_dialogs.gyp:web_dialogs_test_support', + '../url/url.gyp:url', 'ash', 'ash_resources', 'ash_test_support', |