diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-12 18:29:52 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-12 18:29:52 +0000 |
| commit | e6b2093a888e1e55626475dfe9cc813596b206bc (patch) | |
| tree | e4ef749d9c58e52f902b5c2d90944c5827d6e8ed /ash/ash.gyp | |
| parent | f55849fdae7bd1fdc7cc52767f99d91251496ad0 (diff) | |
| download | chromium_src-e6b2093a888e1e55626475dfe9cc813596b206bc.zip chromium_src-e6b2093a888e1e55626475dfe9cc813596b206bc.tar.gz chromium_src-e6b2093a888e1e55626475dfe9cc813596b206bc.tar.bz2 | |
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
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@193968 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/ash.gyp')
| -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', |